From: H Hartley Sweeten Date: Tue, 9 Apr 2013 01:16:03 +0000 (-0700) Subject: staging: comedi: rti800: remove interrupt code X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5eb6eadec53012ddd820dbab686665b02313dca;p=linux-beck.git staging: comedi: rti800: remove interrupt code Interrupts are not enabled, or used, in this driver. Remove the {request,free}_irq() as well as the dummy interrupt function. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index eac727e2dae2..fdd248e8b5e9 100644 --- a/drivers/staging/comedi/drivers/rti800.c +++ b/drivers/staging/comedi/drivers/rti800.c @@ -30,7 +30,7 @@ Devices: [Analog Devices] RTI-800 (rti800), RTI-815 (rti815) Configuration options: [0] - I/O port base address - [1] - IRQ + [1] - IRQ (not supported / unused) [2] - A/D reference 0 = differential 1 = pseudodifferential (common) @@ -161,11 +161,6 @@ struct rti800_private { #define RTI800_TIMEOUT 100 -static irqreturn_t rti800_interrupt(int irq, void *dev) -{ - return IRQ_HANDLED; -} - /* settling delay times in usec for different gains */ static const int gaindelay[] = { 10, 20, 40, 80 }; @@ -303,7 +298,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) { const struct rti800_board *board = comedi_board(dev); struct rti800_private *devpriv; - unsigned int irq; unsigned long iobase; int ret; struct comedi_subdevice *s; @@ -317,15 +311,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) inb(dev->iobase + RTI800_ADCHI); outb(0, dev->iobase + RTI800_CLRFLAGS); - irq = it->options[1]; - if (irq) { - ret = request_irq(irq, rti800_interrupt, 0, dev->board_name, - dev); - if (ret < 0) - return ret; - dev->irq = irq; - } - ret = comedi_alloc_subdevices(dev, 4); if (ret) return ret; @@ -425,8 +410,6 @@ static void rti800_detach(struct comedi_device *dev) { if (dev->iobase) release_region(dev->iobase, RTI800_SIZE); - if (dev->irq) - free_irq(dev->irq, dev); } static struct comedi_driver rti800_driver = {