Skip to content

Commit

Permalink
staging: comedi: ni_daq_dio24: remove the '#ifdef incomplete' code
Browse files Browse the repository at this point in the history
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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 4, 2013
1 parent fb89942 commit 4172246
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions drivers/staging/comedi/drivers/ni_daq_dio24.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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");
Expand All @@ -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");
Expand All @@ -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);
Expand Down

0 comments on commit 4172246

Please sign in to comment.