staging: comedi: pcl726: cleanup dev->board_name usage
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:08:22 +0000 (16:08 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:36 +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/pcl726.c

index 1cc0aa88f372bdef8bd9624eb4a37c515f4fcc19..e4b7484988bd6d5a6402caa7698ae49943fd2af4 100644 (file)
@@ -236,15 +236,13 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        iorange = board->io_range;
        printk(KERN_WARNING "comedi%d: pcl726: board=%s, 0x%03lx ", dev->minor,
               board->name, iobase);
-       if (!request_region(iobase, iorange, "pcl726")) {
+       if (!request_region(iobase, iorange, dev->board_name)) {
                printk(KERN_WARNING "I/O port conflict\n");
                return -EIO;
        }
 
        dev->iobase = iobase;
 
-       dev->board_name = board->name;
-
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)
                return -ENOMEM;
@@ -268,7 +266,7 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                irq = 0;        /* Bad IRQ */
                        } else {
                                if (request_irq(irq, interrupt_pcl818, 0,
-                                               "pcl726", dev)) {
+                                               dev->board_name, dev)) {
                                        printk(KERN_WARNING
                                                ", unable to allocate IRQ %d,"
                                                " DISABLING IT", irq);