staging: comedi: addi_apci_1564: call apci1564_interrupt() directly
authorChase Southwood <chase.southwood@gmail.com>
Sat, 3 May 2014 07:57:41 +0000 (02:57 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 12:16:48 +0000 (21:16 +0900)
Remove the boardinfo about the interrupt function and just call it
directly.

Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi_apci_1564.c

index f1dc3710aba106eafb91139783c873d5edc830a3..86276cdb6f47d33ec62fc9c96057669632ba59d5 100644 (file)
@@ -15,7 +15,6 @@ static const struct addi_board apci1564_boardtypes[] = {
                .i_NbrDoChannel         = 32,
                .i_DoMaxdata            = 0xffffffff,
                .i_Timer                = 1,
-               .interrupt              = apci1564_interrupt,
                .timer_config           = apci1564_timer_config,
                .timer_write            = apci1564_timer_write,
                .timer_read             = apci1564_timer_read,
@@ -24,10 +23,7 @@ static const struct addi_board apci1564_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);
+       apci1564_interrupt(irq, d);
        return IRQ_RETVAL(1);
 }