---

yaml --- r: 354066 b: refs/heads/master c: 903b6c9 h: refs/heads/master v: v3
git-mirror · Jan 18, 2013 · 3f51785 · 3f51785
1 parent a77b994
commit 3f51785
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfc252583cc0dc7d164ebd84b4aba0f545e8401e
+refs/heads/master: 903b6c94bb51808d9619d9c17179202ff1a808f4
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -21,15 +21,6 @@ static const struct addi_board apci2200_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 int apci2200_reset(struct comedi_device *dev)
 {
 	outw(0x0, dev->iobase + APCI2200_DIGITAL_OP);
@@ -86,15 +77,6 @@ static int apci2200_auto_attach(struct comedi_device *dev,
 
 	dev->iobase = pci_resource_start(pcidev, 1);
 
-	/* ## */
-
-	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)
@@ -184,8 +166,6 @@ static void apci2200_detach(struct comedi_device *dev)
 	if (devpriv) {
 		if (dev->iobase)
 			apci2200_reset(dev);
-		if (dev->irq)
-			free_irq(dev->irq, dev);
 	}
 	if (pcidev) {
 		if (dev->iobase)