]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: comedi: addi_apci_1710: remove 'interrupt' from boardinfo
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 5 Mar 2013 17:26:02 +0000 (10:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Mar 2013 17:05:23 +0000 (10:05 -0700)
Only one board type is supported by this driver. Remove the 'interrupt'
field from the boardinfo and just call the function directly in
v_ADDI_Interrupt().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi_apci_1710.c

index f32a79a2afcacecbeb861183ea7accca317f15d0..068b0169f4c7ad4c8d4ea8ee06d208083fb3d167 100644 (file)
@@ -26,16 +26,12 @@ static const struct addi_board apci1710_boardtypes[] = {
                .pc_DriverName          = "apci1710",
                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA_OLD,
                .i_DeviceId             = APCI1710_BOARD_DEVICE_ID,
-               .interrupt              = v_APCI1710_Interrupt,
        },
 };
 
 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);
+       v_APCI1710_Interrupt(irq, d);
        return IRQ_RETVAL(1);
 }