From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 5 Mar 2013 17:26:02 +0000 (-0700)
Subject: staging: comedi: addi_apci_1710: remove 'interrupt' from boardinfo
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cf55a71e43685b39ea6a2cf568a54d05b12b97d5;p=openwrt%2Fstaging%2Fblogic.git

staging: comedi: addi_apci_1710: remove 'interrupt' from boardinfo

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>
---

diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index f32a79a2afca..068b0169f4c7 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -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);
 }