Skip to content

Commit

Permalink
staging: comedi: cb_pcidas: use the driver_name for the resource name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent b8ac8c6 commit 0a5aed4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/cb_pcidas.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 0a5aed4

Please sign in to comment.