Commit 19f5224b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c108a5e0
...@@ -990,7 +990,6 @@ static int nidio_auto_attach(struct comedi_device *dev, ...@@ -990,7 +990,6 @@ static int nidio_auto_attach(struct comedi_device *dev,
if (devpriv->di_mite_ring == NULL) if (devpriv->di_mite_ring == NULL)
return -ENOMEM; return -ENOMEM;
irq = mite_irq(devpriv->mite);
if (board->uses_firmware) { if (board->uses_firmware) {
ret = pci_6534_upload_firmware(dev); ret = pci_6534_upload_firmware(dev);
if (ret < 0) if (ret < 0)
...@@ -1033,12 +1032,13 @@ static int nidio_auto_attach(struct comedi_device *dev, ...@@ -1033,12 +1032,13 @@ static int nidio_auto_attach(struct comedi_device *dev,
devpriv->mite->daq_io_addr + devpriv->mite->daq_io_addr +
Master_DMA_And_Interrupt_Control); Master_DMA_And_Interrupt_Control);
ret = request_irq(irq, nidio_interrupt, IRQF_SHARED, irq = mite_irq(devpriv->mite);
"ni_pcidio", dev); if (irq) {
if (ret < 0) ret = request_irq(irq, nidio_interrupt, IRQF_SHARED,
dev_warn(dev->class_dev, "irq not available\n"); dev->board_name, dev);
if (ret == 0)
dev->irq = irq; dev->irq = irq;
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment