staging: comedi: addi_apci_1564: board does not use an AMCC PCI controller

According to ADDI-DATA, the APCI-1564 board has a FPGA with a PCI core, it
does not use an AMCC PCI controller chip.

Remove the amcc_s5933.h include as well as the read of the AMCC_OP_REG_INTCSR
register. That offset would actually read APCI1564_WDOG_STATUS_REG register
in the FPGA which has nothing to do with the interrupt status.

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>

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index aa908a4a24cfd12a87ec1a890a8ebb9602cc2502..cf14b0a923d408d48c9312fa81f7b96e0e6c490c 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -28,7 +28,6 @@
 
 #include "../comedidev.h"
 #include "comedi_fc.h"
-#include "amcc_s5933.h"
 #include "addi_watchdog.h"
 
 struct apci1564_private {
@@ -80,11 +79,6 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
        unsigned int ctrl;
        unsigned int chan;
 
-       /* check interrupt is from this device */
-       if ((inl(devpriv->amcc_iobase + AMCC_OP_REG_INTCSR) &
-            INTCSR_INTR_ASSERTED) == 0)
-               return IRQ_NONE;
-
        status = inl(devpriv->amcc_iobase + APCI1564_DI_IRQ_REG);
        if (status & APCI1564_DI_INT_ENABLE) {
                /* disable the interrupt */