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

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
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -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);

	irq = mite_irq(devpriv->mite);
	if (irq) {
		ret = request_irq(irq, nidio_interrupt, IRQF_SHARED,
				"ni_pcidio", dev);
	if (ret < 0)
		dev_warn(dev->class_dev, "irq not available\n");

				  dev->board_name, dev);
		if (ret == 0)
			dev->irq = irq;
	}

	return 0;
}