]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: pcl818: cleanup dev->board_name usage
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:11:10 +0000 (16:11 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:37 +0000 (12:47 -0700)
This legacy driver does no additional probing so the dev->board_name
will already be properly initialized by the comedi core before calling
the (*attach) function.

Remove the unnecessary initialization of dev->board_name and use it
when requesting the resources instead of the open-coded strings.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/pcl818.c

index b5af22eb7c37ddfe99be864b9315bb838e98053b..e4df63e2e3f97c8605ab38f2dffc832ab54ca899 100644 (file)
@@ -1616,7 +1616,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                devpriv->io_range = PCLx1xFIFO_RANGE;
                devpriv->usefifo = 1;
        }
-       if (!request_region(iobase, devpriv->io_range, "pcl818")) {
+       if (!request_region(iobase, devpriv->io_range, dev->board_name)) {
                comedi_error(dev, "I/O port conflict\n");
                return -EIO;
        }
@@ -1628,8 +1628,6 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                return -EIO;
        }
 
-       dev->board_name = board->name;
-
        /* grab our IRQ */
        irq = 0;
        if (board->IRQbits != 0) {      /* board support IRQ */
@@ -1641,8 +1639,8 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                     irq);
                                irq = 0;        /* Bad IRQ */
                        } else {
-                               if (request_irq
-                                   (irq, interrupt_pcl818, 0, "pcl818", dev)) {
+                               if (request_irq(irq, interrupt_pcl818, 0,
+                                               dev->board_name, dev)) {
                                        printk
                                            (", unable to allocate IRQ %u, DISABLING IT",
                                             irq);
@@ -1707,7 +1705,7 @@ no_rtc:
                        printk(KERN_ERR "DMA is out of allowed range, FAIL!\n");
                        return -EINVAL; /* Bad DMA */
                }
-               ret = request_dma(dma, "pcl818");
+               ret = request_dma(dma, dev->board_name);
                if (ret)
                        return -EBUSY;  /* DMA isn't free */
                devpriv->dma = dma;