diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-18 17:01:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 14:43:01 -0700 |
| commit | 71e068743a5e4061a7a3c42cc3ac6dbda7a7f76e (patch) | |
| tree | b980d9ff32b6020398c0b92c391cf859846ba81b /drivers/staging | |
| parent | 3d03cfcaf6cde186f439ca1a318423007570760a (diff) | |
| download | op-kernel-dev-71e068743a5e4061a7a3c42cc3ac6dbda7a7f76e.zip op-kernel-dev-71e068743a5e4061a7a3c42cc3ac6dbda7a7f76e.tar.gz | |
staging: comedi: drivers: use dev->board_name in request_irq()
Most of the comedi drivers use the dev->board_name for the id string
passed to request_irq(). Fix the couple that still pass something
else.
Also, propogate the errno from request_irq().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidas.c | 7 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidas64.c | 9 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_660x.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_atmio.c | 3 |
4 files changed, 12 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index 8e82383..4a7bd4e 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -1471,11 +1471,12 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, outl(INTCSR_INBOX_INTR_STATUS, devpriv->s5933_config + AMCC_OP_REG_INTCSR); - if (request_irq(pcidev->irq, cb_pcidas_interrupt, - IRQF_SHARED, dev->driver->driver_name, dev)) { + ret = request_irq(pcidev->irq, cb_pcidas_interrupt, IRQF_SHARED, + dev->board_name, dev); + if (ret) { dev_dbg(dev->class_dev, "unable to allocate irq %d\n", pcidev->irq); - return -EINVAL; + return ret; } dev->irq = pcidev->irq; diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 4012d8c..4b332dd 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -3989,12 +3989,13 @@ static int auto_attach(struct comedi_device *dev, devpriv->hw_revision); init_plx9080(dev); init_stc_registers(dev); - /* get irq */ - if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED, - "cb_pcidas64", dev)) { + + retval = request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED, + dev->board_name, dev); + if (retval) { dev_dbg(dev->class_dev, "unable to allocate irq %u\n", pcidev->irq); - return -EINVAL; + return retval; } dev->irq = pcidev->irq; dev_dbg(dev->class_dev, "irq %u\n", dev->irq); diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index f058056..6b8c702 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c @@ -1165,8 +1165,8 @@ static int ni_660x_auto_attach(struct comedi_device *dev, for (i = 0; i < board->n_chips; ++i) set_tio_counterswap(dev, i); - ret = request_irq(pcidev->irq, ni_660x_interrupt, - IRQF_SHARED, "ni_660x", dev); + ret = request_irq(pcidev->irq, ni_660x_interrupt, IRQF_SHARED, + dev->board_name, dev); if (ret < 0) { dev_warn(dev->class_dev, " irq not available\n"); return ret; diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c index c1292db..2bd9f69 100644 --- a/drivers/staging/comedi/drivers/ni_atmio.c +++ b/drivers/staging/comedi/drivers/ni_atmio.c @@ -345,8 +345,7 @@ static int ni_atmio_attach(struct comedi_device *dev, if (irq > 15 || ni_irqpin[irq] == -1) return -EINVAL; ret = request_irq(irq, ni_E_interrupt, 0, - "ni_atmio", dev); - + dev->board_name, dev); if (ret < 0) return -EINVAL; dev->irq = irq; |
