aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-11-26 18:41:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-03 12:20:20 -0500
commitd7bfe8e845ad03a48bc0e988cddedb536e296144 (patch)
treeea44958e2fbc41c94683ded228fb2828eca8f454
parentbaa92cc0bfcb159ffae8f17a9a6971c2419fa2c7 (diff)
staging: comedi: dt2811: remove disabled interrupt support code
The interrupt support in this driver is incomplete due to the missing comedi functions to support async commands. Since the interrupt code is already disable just remove it. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/dt2811.c72
1 files changed, 1 insertions, 71 deletions
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index 686d86c93faa..115eb0ad77ef 100644
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -42,7 +42,6 @@ Configuration options:
42*/ 42*/
43 43
44#include <linux/module.h> 44#include <linux/module.h>
45#include <linux/interrupt.h>
46#include "../comedidev.h" 45#include "../comedidev.h"
47 46
48static const struct comedi_lrange range_dt2811_pgh_ai_5_unipolar = { 47static const struct comedi_lrange range_dt2811_pgh_ai_5_unipolar = {
@@ -227,33 +226,6 @@ static const struct comedi_lrange *dac_range_types[] = {
227 226
228#define DT2811_TIMEOUT 5 227#define DT2811_TIMEOUT 5
229 228
230#if 0
231static irqreturn_t dt2811_interrupt(int irq, void *d)
232{
233 int lo, hi;
234 int data;
235 struct comedi_device *dev = d;
236 struct dt2811_private *devpriv = dev->private;
237
238 if (!dev->attached) {
239 comedi_error(dev, "spurious interrupt");
240 return IRQ_HANDLED;
241 }
242
243 lo = inb(dev->iobase + DT2811_ADDATLO);
244 hi = inb(dev->iobase + DT2811_ADDATHI);
245
246 data = lo + (hi << 8);
247
248 if (!(--devpriv->ntrig)) {
249 /* how to turn off acquisition */
250 s->async->events |= COMEDI_SB_EOA;
251 }
252 comedi_event(dev, s);
253 return IRQ_HANDLED;
254}
255#endif
256
257static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, 229static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
258 struct comedi_insn *insn, unsigned int *data) 230 struct comedi_insn *insn, unsigned int *data)
259{ 231{
@@ -357,10 +329,7 @@ static int dt2811_do_insn_bits(struct comedi_device *dev,
357*/ 329*/
358static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it) 330static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
359{ 331{
360 /* int i, irq; */ 332 /* int i; */
361 /* unsigned long irqs; */
362 /* long flags; */
363
364 const struct dt2811_board *board = comedi_board(dev); 333 const struct dt2811_board *board = comedi_board(dev);
365 struct dt2811_private *devpriv; 334 struct dt2811_private *devpriv;
366 int ret; 335 int ret;
@@ -377,45 +346,6 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
377 i = inb(dev->iobase + DT2811_ADDATHI); 346 i = inb(dev->iobase + DT2811_ADDATHI);
378#endif 347#endif
379 348
380#if 0
381 irq = it->options[1];
382 if (irq < 0) {
383 save_flags(flags);
384 sti();
385 irqs = probe_irq_on();
386
387 outb(DT2811_CLRERROR | DT2811_INTENB,
388 dev->iobase + DT2811_ADCSR);
389 outb(0, dev->iobase + DT2811_ADGCR);
390
391 udelay(100);
392
393 irq = probe_irq_off(irqs);
394 restore_flags(flags);
395
396 /*outb(DT2811_CLRERROR|DT2811_INTENB,
397 dev->iobase+DT2811_ADCSR);*/
398
399 if (inb(dev->iobase + DT2811_ADCSR) & DT2811_ADERROR)
400 printk(KERN_ERR "error probing irq (bad)\n");
401 dev->irq = 0;
402 if (irq > 0) {
403 i = inb(dev->iobase + DT2811_ADDATLO);
404 i = inb(dev->iobase + DT2811_ADDATHI);
405 printk(KERN_INFO "(irq = %d)\n", irq);
406 ret = request_irq(irq, dt2811_interrupt, 0,
407 dev->board_name, dev);
408 if (ret < 0)
409 return -EIO;
410 dev->irq = irq;
411 } else if (irq == 0) {
412 printk(KERN_INFO "(no irq)\n");
413 } else {
414 printk(KERN_ERR "( multiple irq's -- this is bad! )\n");
415 }
416 }
417#endif
418
419 ret = comedi_alloc_subdevices(dev, 4); 349 ret = comedi_alloc_subdevices(dev, 4);
420 if (ret) 350 if (ret)
421 return ret; 351 return ret;