All the '#ifdef incomplete' code deals with interrupt support in
this driver. For now just remove all this #if'defed out code.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/ni_daq_dio24.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c 
b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 4982cc7..9aca9dd 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -94,9 +94,6 @@ static int dio24_attach(struct comedi_device *dev, struct 
comedi_devconfig *it)
        struct dio24_private *devpriv;
        struct comedi_subdevice *s;
        unsigned long iobase = 0;
-#ifdef incomplete
-       unsigned int irq = 0;
-#endif
        struct pcmcia_device *link;
        int ret;
 
@@ -112,9 +109,6 @@ static int dio24_attach(struct comedi_device *dev, struct 
comedi_devconfig *it)
                if (!link)
                        return -EIO;
                iobase = link->resource[0]->start;
-#ifdef incomplete
-               irq = link->irq;
-#endif
                break;
        default:
                pr_err("bug! couldn't determine board type\n");
@@ -123,10 +117,6 @@ static int dio24_attach(struct comedi_device *dev, struct 
comedi_devconfig *it)
        }
        pr_debug("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev->minor,
                 thisboard->name, iobase);
-#ifdef incomplete
-       if (irq)
-               pr_debug("irq %u\n", irq);
-#endif
 
        if (iobase == 0) {
                pr_err("io base address is zero!\n");
@@ -135,11 +125,6 @@ static int dio24_attach(struct comedi_device *dev, struct 
comedi_devconfig *it)
 
        dev->iobase = iobase;
 
-#ifdef incomplete
-       /* grab our IRQ */
-       dev->irq = irq;
-#endif
-
        dev->board_name = thisboard->name;
 
        ret = comedi_alloc_subdevices(dev, 1);
-- 
1.8.1.1.293.gfe73786

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to