aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChase Southwood <chase.southwood@gmail.com>2014-05-03 02:57:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-23 21:16:48 +0900
commit49e66262d9296e618b25d8a8128f2dff1ca59637 (patch)
tree60c766ce4a41a39d237f2a4bbf77b7d30032b710 /drivers
parentaed3f9d498babd9cf4f0656e4a415cd25c725aa3 (diff)
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 <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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_1564.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index f1dc3710aba..86276cdb6f4 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);
}