staging: comedi: dt2814: remove disabled irq probe code
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 26 Nov 2013 17:21:28 +0000 (10:21 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Nov 2013 17:55:17 +0000 (09:55 -0800)
The irq probe code in dt2814_attach() is disabled by an #if 0 block.
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>
drivers/staging/comedi/drivers/dt2814.c

index 6514b9e0055283dfc8d050a2b4b1554f946efbdb..4b414783384318f72a873fadfdd41e4b30a129ff 100644 (file)
@@ -256,26 +256,6 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        i = inb(dev->iobase + DT2814_DATA);
 
        irq = it->options[1];
-#if 0
-       if (irq < 0) {
-               save_flags(flags);
-               sti();
-               irqs = probe_irq_on();
-
-               outb(0, dev->iobase + DT2814_CSR);
-
-               udelay(100);
-
-               irq = probe_irq_off(irqs);
-               restore_flags(flags);
-               if (inb(dev->iobase + DT2814_CSR) & DT2814_ERR)
-                       printk(KERN_DEBUG "error probing irq (bad)\n");
-
-
-               i = inb(dev->iobase + DT2814_DATA);
-               i = inb(dev->iobase + DT2814_DATA);
-       }
-#endif
        dev->irq = 0;
        if (irq > 0) {
                if (request_irq(irq, dt2814_interrupt, 0, "dt2814", dev)) {
@@ -286,12 +266,6 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                }
        } else if (irq == 0) {
                printk(KERN_WARNING "(no irq)\n");
-       } else {
-#if 0
-               printk(KERN_DEBUG "(probe returned multiple irqs--bad)\n");
-#else
-               printk(KERN_WARNING "(irq probe not implemented)\n");
-#endif
        }
 
        ret = comedi_alloc_subdevices(dev, 1);