Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f4a52b40

drivers/staging/comedi/drivers/addi_apci_1564.c

+0 −6
Original line number Diff line number Diff line
@@ -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 */