openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-01-30 16:45:32 -07:00 committed by Greg Kroah-Hartman
parent fb89942cb3
commit 41722460b7
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/ni_daq_dio24.c
View File

@ -94,9 +94,6 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct dio24_private *devpriv; struct dio24_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned long iobase = 0; unsigned long iobase = 0;
#ifdef incomplete
unsigned int irq = 0;
#endif
struct pcmcia_device *link; struct pcmcia_device *link;
int ret; int ret;
@ -112,9 +109,6 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!link) if (!link)
return -EIO; return -EIO;
iobase = link->resource[0]->start; iobase = link->resource[0]->start;
#ifdef incomplete
irq = link->irq;
#endif
break; break;
default: default:
pr_err("bug! couldn't determine board type\n"); 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, pr_debug("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev->minor,
thisboard->name, iobase); thisboard->name, iobase);
#ifdef incomplete
if (irq)
pr_debug("irq %u\n", irq);
#endif
if (iobase == 0) { if (iobase == 0) {
pr_err("io base address is zero!\n"); 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; dev->iobase = iobase;
#ifdef incomplete
/* grab our IRQ */
dev->irq = irq;
#endif
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
ret = comedi_alloc_subdevices(dev, 1); ret = comedi_alloc_subdevices(dev, 1);