diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-03 12:07:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 15:25:32 -0800 |
| commit | 19f5224b754823f1649f3094d916b0a775fc9d42 (patch) | |
| tree | ed450389a7a27b43bb1e985132a9451c70a8e6bc | |
| parent | c108a5e09803850217c5b9d9079f99383401a312 (diff) | |
staging: comedi: ni_pcidio: tidy up the irq request
The irq is only needed to support async commands. Tidy up the
code that does the request_irq() and remove the noise.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_pcidio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 313b436617b..645a4d80e60 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c @@ -990,7 +990,6 @@ static int nidio_auto_attach(struct comedi_device *dev, if (devpriv->di_mite_ring == NULL) return -ENOMEM; - irq = mite_irq(devpriv->mite); if (board->uses_firmware) { ret = pci_6534_upload_firmware(dev); if (ret < 0) @@ -1033,12 +1032,13 @@ static int nidio_auto_attach(struct comedi_device *dev, devpriv->mite->daq_io_addr + Master_DMA_And_Interrupt_Control); - ret = request_irq(irq, nidio_interrupt, IRQF_SHARED, - "ni_pcidio", dev); - if (ret < 0) - dev_warn(dev->class_dev, "irq not available\n"); - - dev->irq = irq; + irq = mite_irq(devpriv->mite); + if (irq) { + ret = request_irq(irq, nidio_interrupt, IRQF_SHARED, + dev->board_name, dev); + if (ret == 0) + dev->irq = irq; + } return 0; } |