iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-06-26 18:02:40 -07:00 committed by Greg Kroah-Hartman
parent b8ac8c6342
commit 0a5aed4876
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/drivers/cb_pcidas.c
View File

@ -1567,7 +1567,7 @@ static int cb_pcidas_attach(struct comedi_device *dev,
return -EIO; return -EIO;
thisboard = comedi_board(dev); 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, dev_err(dev->class_dev,
"Failed to enable PCI device and request regions\n"); "Failed to enable PCI device and request regions\n");
return -EIO; return -EIO;
@ -1585,7 +1585,7 @@ static int cb_pcidas_attach(struct comedi_device *dev,
devpriv->s5933_config + AMCC_OP_REG_INTCSR); devpriv->s5933_config + AMCC_OP_REG_INTCSR);
if (request_irq(devpriv->pci_dev->irq, cb_pcidas_interrupt, 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", dev_dbg(dev->class_dev, "unable to allocate irq %d\n",
devpriv->pci_dev->irq); devpriv->pci_dev->irq);
return -EINVAL; return -EINVAL;