]> Pileus Git - ~andy/linux/commitdiff
staging: comedi: addi_apci_1516: boards do not have interrupts
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 13 Nov 2012 20:41:06 +0000 (13:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2012 23:12:47 +0000 (15:12 -0800)
The boards supported by this driver do not have interrupt capabiltiy.
Remove the interrupt support code.

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>
drivers/staging/comedi/drivers/addi_apci_1516.c

index c1caeb1e525b62bb836c48e3e86e8734c948ccf7..d78174afdf2ddf5284e6f7966ccc2e5341bd1176 100644 (file)
@@ -52,15 +52,6 @@ static const struct addi_board apci1516_boardtypes[] = {
        },
 };
 
-static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
-{
-       struct comedi_device *dev = d;
-       const struct addi_board *this_board = comedi_board(dev);
-
-       this_board->interrupt(irq, d);
-       return IRQ_RETVAL(1);
-}
-
 static int apci1516_reset(struct comedi_device *dev)
 {
        const struct addi_board *this_board = comedi_board(dev);
@@ -153,15 +144,6 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev,
        devpriv->s_EeParameters.ui_MinDelaytimeNs =
                this_board->ui_MinDelaytimeNs;
 
-       /* ## */
-
-       if (pcidev->irq > 0) {
-               ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
-                                 dev->board_name, dev);
-               if (ret == 0)
-                       dev->irq = pcidev->irq;
-       }
-
        n_subdevices = 7;
        ret = comedi_alloc_subdevices(dev, n_subdevices);
        if (ret)
@@ -253,8 +235,6 @@ static void apci1516_detach(struct comedi_device *dev)
        if (devpriv) {
                if (dev->iobase)
                        apci1516_reset(dev);
-               if (dev->irq)
-                       free_irq(dev->irq, dev);
                if (devpriv->dw_AiBase)
                        iounmap(devpriv->dw_AiBase);
        }