From: Chase Southwood Date: Sat, 3 May 2014 07:57:41 +0000 (-0500) Subject: staging: comedi: addi_apci_1564: call apci1564_interrupt() directly X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~502 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=49e66262d9296e618b25d8a8128f2dff1ca59637;p=firefly-linux-kernel-4.4.55.git staging: comedi: addi_apci_1564: call apci1564_interrupt() directly Remove the boardinfo about the interrupt function and just call it directly. Signed-off-by: Chase Southwood Reviewed-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c index f1dc3710aba1..86276cdb6f47 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1564.c +++ b/drivers/staging/comedi/drivers/addi_apci_1564.c @@ -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); }