staging: comedi: s626: use dev->board_name for resource name

Instead of the literal string "s626", use the dev->board_name for
the resource name when enabling the PCI device and requesting the
irq.

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

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index e30833f4178c8796524ad9520d421016902871ad..fb215b24fce8bb19ee6708893a3502a75518bd16 100644 (file)
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2453,11 +2453,12 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
        struct comedi_subdevice *s;
 
        comedi_set_hw_dev(dev, &pcidev->dev);
+       dev->board_name = dev->driver->driver_name;
 
        if (alloc_private(dev, sizeof(struct s626_private)) < 0)
                return -ENOMEM;
 
-       result = comedi_pci_enable(pcidev, "s626");
+       result = comedi_pci_enable(pcidev, dev->board_name);
        if (result < 0) {
                printk(KERN_ERR "s626_attach: comedi_pci_enable fails\n");
                return -ENODEV;
@@ -2510,8 +2511,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 
        }
 
-       dev->board_name = dev->driver->driver_name;
-
        ret = comedi_alloc_subdevices(dev, 6);
        if (ret)
                return ret;
@@ -2524,7 +2523,7 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
                printk(KERN_ERR " unknown irq (bad)\n");
        } else {
                ret = request_irq(dev->irq, s626_irq_handler, IRQF_SHARED,
-                                 "s626", dev);
+                                 dev->board_name, dev);
 
                if (ret < 0) {
                        printk(KERN_ERR " irq not available\n");