From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 27 Jun 2012 01:02:40 +0000 (-0700)
Subject: staging: comedi: cb_pcidas: use the driver_name for the resource name
X-Git-Tag: next-20120724~21^2~489
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a5aed487645b13531b876775c1390afd20296a5;p=karo-tx-linux.git

staging: comedi: cb_pcidas: use the driver_name for the resource name

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>
---

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 9f883dd77b34..9379d2517702 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -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;