From: H Hartley Sweeten Date: Wed, 30 Jan 2013 23:45:32 +0000 (-0700) Subject: staging: comedi: ni_daq_dio24: remove the '#ifdef incomplete' code X-Git-Tag: firefly_0821_release~3680^2~1080^2~178 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=41722460b70763eea69a76b4eb743b7295dfaa62;p=firefly-linux-kernel-4.4.55.git staging: comedi: ni_daq_dio24: remove the '#ifdef incomplete' code 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 4982cc70c3ee..9aca9dd57a2d 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);