From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 23:28:35 +0000 (-0700)
Subject: staging: comedi: multiq3: board does not use interrupts
X-Git-Tag: firefly_0821_release~3680^2~674^2~124
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf00515e0d73576e3da2e9b804fb0175b3cf40b5;p=firefly-linux-kernel-4.4.55.git

staging: comedi: multiq3: board does not use interrupts

This driver does not use interruptes. Don't bother parsing the
configuration option from "comedi_config".

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

diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c
index fe94a62de438..056689fc11c5 100644
--- a/drivers/staging/comedi/drivers/multiq3.c
+++ b/drivers/staging/comedi/drivers/multiq3.c
@@ -224,7 +224,6 @@ static void encoder_reset(struct comedi_device *dev)
 
 /*
    options[0] - I/O port
-   options[1] - irq
    options[2] - number of encoder chips installed
  */
 
@@ -234,7 +233,6 @@ static int multiq3_attach(struct comedi_device *dev,
 	struct multiq3_private *devpriv;
 	int result = 0;
 	unsigned long iobase;
-	unsigned int irq;
 	struct comedi_subdevice *s;
 
 	iobase = it->options[0];
@@ -246,13 +244,6 @@ static int multiq3_attach(struct comedi_device *dev,
 
 	dev->iobase = iobase;
 
-	irq = it->options[1];
-	if (irq)
-		printk(KERN_WARNING "comedi%d: irq = %u ignored\n",
-			dev->minor, irq);
-	else
-		printk(KERN_WARNING "comedi%d: no irq\n", dev->minor);
-
 	result = comedi_alloc_subdevices(dev, 5);
 	if (result)
 		return result;
@@ -318,8 +309,6 @@ static void multiq3_detach(struct comedi_device *dev)
 {
 	if (dev->iobase)
 		release_region(dev->iobase, MULTIQ3_SIZE);
-	if (dev->irq)
-		free_irq(dev->irq, dev);
 }
 
 static struct comedi_driver multiq3_driver = {