From 731ff7e79053c4d740e24e8339e15e0774936202 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 16:22:28 -0700
Subject: [PATCH] staging: comedi: c6xdigio: 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>
---
drivers/staging/comedi/drivers/c6xdigio.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index 816b879c7e19..3cd09cb71421 100644
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -399,7 +399,6 @@ static void board_init(struct comedi_device *dev)
/*
options[0] - I/O port
- options[1] - irq
options[2] - number of encoder chips installed
*/
@@ -421,7 +420,6 @@ static int c6xdigio_attach(struct comedi_device *dev,
{
int result = 0;
unsigned long iobase;
- unsigned int irq;
struct comedi_subdevice *s;
iobase = it->options[0];
@@ -439,13 +437,6 @@ static int c6xdigio_attach(struct comedi_device *dev,
/* Make sure that PnP ports get activated */
pnp_register_driver(&c6xdigio_pnp_driver);
- irq = it->options[1];
- if (irq > 0)
- printk(KERN_DEBUG "comedi%d: irq = %u ignored\n",
- dev->minor, irq);
- else if (irq == 0)
- printk(KERN_DEBUG "comedi%d: no irq\n", dev->minor);
-
s = &dev->subdevices[0];
/* pwm output subdevice */
s->type = COMEDI_SUBD_AO; /* Not sure what to put here */
@@ -489,8 +480,6 @@ static void c6xdigio_detach(struct comedi_device *dev)
{
if (dev->iobase)
release_region(dev->iobase, C6XDIGIO_SIZE);
- if (dev->irq)
- free_irq(dev->irq, dev);
pnp_unregister_driver(&c6xdigio_pnp_driver);
}
--
2.34.1