staging: comedi: ni_daq_700: remove the #ifdef'ed out irq code
PATCH 21/31 staging: comedi: ni_daq_700: remove the #ifdef'ed out irq code
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 <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Frank Mori Hess <[email protected]>
Cc Greg Kroah-hartman <[email protected]>
--- drivers/staging/comedi/drivers/ni_daq_700.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)
drivers/staging/comedi/drivers/ni_daq_700.c +2 -23
@@ -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[] = {
Signature · 1 line
1.7.11