]> Pileus Git - ~andy/linux/commitdiff
staging: comedi: cb_pcidas: use the driver_name for the resource name
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 27 Jun 2012 01:02:40 +0000 (18:02 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jul 2012 22:23:53 +0000 (15:23 -0700)
Use the dev->driver->driver_name for the resource name passed
to pci_request_regions(), by way of comedi_pci_enable(), and
to request_irq() instead of the open coded "cb_pcidas".

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>
drivers/staging/comedi/drivers/cb_pcidas.c

index 9f883dd77b34c3c319a373704ef3bea8b57f64cc..9379d2517702457a586dd7cb640bf9c8d97f7ff7 100644 (file)
@@ -1567,7 +1567,7 @@ static int cb_pcidas_attach(struct comedi_device *dev,
                return -EIO;
        thisboard = comedi_board(dev);
 
-       if (comedi_pci_enable(devpriv->pci_dev, "cb_pcidas")) {
+       if (comedi_pci_enable(devpriv->pci_dev, dev->driver->driver_name)) {
                dev_err(dev->class_dev,
                        "Failed to enable PCI device and request regions\n");
                return -EIO;
@@ -1585,7 +1585,7 @@ static int cb_pcidas_attach(struct comedi_device *dev,
             devpriv->s5933_config + AMCC_OP_REG_INTCSR);
 
        if (request_irq(devpriv->pci_dev->irq, cb_pcidas_interrupt,
-                       IRQF_SHARED, "cb_pcidas", dev)) {
+                       IRQF_SHARED, dev->driver->driver_name, dev)) {
                dev_dbg(dev->class_dev, "unable to allocate irq %d\n",
                        devpriv->pci_dev->irq);
                return -EINVAL;