From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 7 Oct 2015 21:52:41 +0000 (-0700)
Subject: staging: comedi: icp_multi: remove interrupt support
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dd61ceddfe31da38c564a587f26164c33962a5cb;p=openwrt%2Fstaging%2Fblogic.git

staging: comedi: icp_multi: remove interrupt support

The interrupt handler in this driver doesn't do anything other than
read the interrupt status register. Since I can't locate a datasheet
for the board, remove the useless interrupt support code.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index d3c37d581ce1..b37ed42db75b 100644
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -45,7 +45,6 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
 
 #include "../comedi_pci.h"
 
@@ -284,42 +283,6 @@ static int icp_multi_insn_write_ctr(struct comedi_device *dev,
 	return 0;
 }
 
-static irqreturn_t interrupt_service_icp_multi(int irq, void *d)
-{
-	struct comedi_device *dev = d;
-	int int_no;
-
-	/*  Is this interrupt from our board? */
-	int_no = readw(dev->mmio + ICP_MULTI_INT_STAT) & ICP_MULTI_INT_MASK;
-	if (!int_no)
-		/*  No, exit */
-		return IRQ_NONE;
-
-	/*  Determine which interrupt is active & handle it */
-	switch (int_no) {
-	case ICP_MULTI_INT_ADC_RDY:
-		break;
-	case ICP_MULTI_INT_DAC_RDY:
-		break;
-	case ICP_MULTI_INT_DOUT_ERR:
-		break;
-	case ICP_MULTI_INT_DIN_STAT:
-		break;
-	case ICP_MULTI_INT_CIE0:
-		break;
-	case ICP_MULTI_INT_CIE1:
-		break;
-	case ICP_MULTI_INT_CIE2:
-		break;
-	case ICP_MULTI_INT_CIE3:
-		break;
-	default:
-		break;
-	}
-
-	return IRQ_HANDLED;
-}
-
 #if 0
 static int check_channel_list(struct comedi_device *dev,
 			      struct comedi_subdevice *s,
@@ -414,13 +377,6 @@ static int icp_multi_auto_attach(struct comedi_device *dev,
 
 	icp_multi_reset(dev);
 
-	if (pcidev->irq) {
-		ret = request_irq(pcidev->irq, interrupt_service_icp_multi,
-				  IRQF_SHARED, dev->board_name, dev);
-		if (ret == 0)
-			dev->irq = pcidev->irq;
-	}
-
 	s = &dev->subdevices[0];
 	dev->read_subdev = s;
 	s->type = COMEDI_SUBD_AI;