forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_daq_700: remove the #ifdef'ed out irq code

Browse source 
The irq code is not compiled in due to the '#ifdef incomplete'.
And, as stated, it's not even complete. Just remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-06-22 16:31:15 -07:00 • committed by Greg Kroah-Hartman
commit 40cfdb9505
1 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
drivers/staging/comedi/drivers/ni_daq_700.c
View file

@ -37,8 +37,6 @@ port, bit 0; channel 8 corresponds to the input port, bit 0.
Direction configuration: channels 0-7 output, 8-15 input (8225 device
emu as port A output, port B input, port C N/A).
IRQ is assigned but not used.
*/
#include <linux/interrupt.h>
@ -107,9 +105,6 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
const struct dio700_board *thisboard = comedi_board(dev);
struct comedi_subdevice *s;
unsigned long iobase = 0;
#ifdef incomplete
unsigned int irq = 0;
#endif
struct pcmcia_device *link;
int ret;
@ -117,19 +112,9 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!link)
return -EIO;
iobase = link->resource[0]->start;
#ifdef incomplete
irq = link->irq;
#endif
printk(KERN_ERR "comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor,
printk(KERN_ERR "comedi%d: ni_daq_700: %s, io 0x%lx\n", dev->minor,
thisboard->name, iobase);
#ifdef incomplete
if (irq)
printk(", irq %u", irq);
#endif
printk("\n");
if (iobase == 0) {
printk(KERN_ERR "io base address is zero!\n");
@ -138,11 +123,6 @@ static int dio700_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);
@ -167,8 +147,7 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void dio700_detach(struct comedi_device *dev)
{
if (dev->irq)
free_irq(dev->irq, dev);
/* nothing to cleanup */
};
static const struct dio700_board dio700_boards[] = {