---

yaml
---
r: 354459
b: refs/heads/master
c: 82e9ee6
h: refs/heads/master
i:
  354457: a6b4ed2
  354455: ecbc294
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cd8e852629fc7f1bdaacbdd32fe4139b9944f8b
+refs/heads/master: 82e9ee616a89f152f42c7051c5f9f5f0d7663652

trunk/drivers/staging/comedi/drivers/ni_mio_cs.c

@@ -149,8 +149,6 @@ static const struct ni_board_struct ni_boards[] = {
 
 #define IRQ_POLARITY 1
 
-#define NI_E_IRQ_FLAGS		IRQF_SHARED
-
 struct ni_private {
 
 	struct pcmcia_device *link;
@@ -257,12 +255,9 @@ static int mio_cs_auto_attach(struct comedi_device *dev,
 		return ret;
 	dev->iobase = link->resource[0]->start;
 
-	if (!link->irq)
-		return -EINVAL;
-
-	ret = request_irq(link->irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
-			  dev->board_name, dev);
-	if (ret < 0)
+	link->priv = dev;
+	ret = pcmcia_request_irq(link, ni_E_interrupt);
+	if (ret)
 		return ret;
 	dev->irq = link->irq;
 
@@ -282,8 +277,6 @@ static int mio_cs_auto_attach(struct comedi_device *dev,
 static void mio_cs_detach(struct comedi_device *dev)
 {
 	mio_common_detach(dev);
-	if (dev->irq)
-		free_irq(dev->irq, dev);
 	comedi_pcmcia_disable(dev);
 }