---

yaml
---
r: 354079
b: refs/heads/master
c: 046e0d1
h: refs/heads/master
i:
  354077: b8fbb65
  354075: 9200021
  354071: 9566639
  354063: f86fbce
  354047: da6a08e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58b6728c8cecd5022be68b3ac513d7055b869710
+refs/heads/master: 046e0d10bda65c2b096627765b302b3123beee47

trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c

@@ -35,15 +35,6 @@ static const struct addi_board apci16xx_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);
-	return IRQ_RETVAL(1);
-}
-
 static const void *addi_find_boardinfo(struct comedi_device *dev,
 				       struct pci_dev *pcidev)
 {
@@ -120,15 +111,6 @@ static int apci16xx_auto_attach(struct comedi_device *dev,
 	devpriv->s_EeParameters.ui_MinDelaytimeNs =
 		this_board->ui_MinDelaytimeNs;
 
-	/* ## */
-
-	if (pcidev->irq > 0) {
-		ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
-				  dev->board_name, dev);
-		if (ret == 0)
-			dev->irq = pcidev->irq;
-	}
-
 	n_subdevices = 7;
 	ret = comedi_alloc_subdevices(dev, n_subdevices);
 	if (ret)
@@ -186,8 +168,6 @@ static void apci16xx_detach(struct comedi_device *dev)
 	struct addi_private *devpriv = dev->private;
 
 	if (devpriv) {
-		if (dev->irq)
-			free_irq(dev->irq, dev);
 		if (devpriv->dw_AiBase)
 			iounmap(devpriv->dw_AiBase);
 	}