diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-08 21:16:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-09 19:29:03 -0400 |
commit | c5eb6eadec53012ddd820dbab686665b02313dca (patch) | |
tree | f6b20636dc61d3c0709fa5deb2a81d67ca8866ef /drivers/staging | |
parent | 7b2234df5e2ec3fbb206fc4442099faf5859a177 (diff) |
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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/comedi/drivers/rti800.c | 19 |
1 files changed, 1 insertions, 18 deletions
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) | |||
30 | 30 | ||
31 | Configuration options: | 31 | Configuration options: |
32 | [0] - I/O port base address | 32 | [0] - I/O port base address |
33 | [1] - IRQ | 33 | [1] - IRQ (not supported / unused) |
34 | [2] - A/D reference | 34 | [2] - A/D reference |
35 | 0 = differential | 35 | 0 = differential |
36 | 1 = pseudodifferential (common) | 36 | 1 = pseudodifferential (common) |
@@ -161,11 +161,6 @@ struct rti800_private { | |||
161 | 161 | ||
162 | #define RTI800_TIMEOUT 100 | 162 | #define RTI800_TIMEOUT 100 |
163 | 163 | ||
164 | static irqreturn_t rti800_interrupt(int irq, void *dev) | ||
165 | { | ||
166 | return IRQ_HANDLED; | ||
167 | } | ||
168 | |||
169 | /* settling delay times in usec for different gains */ | 164 | /* settling delay times in usec for different gains */ |
170 | static const int gaindelay[] = { 10, 20, 40, 80 }; | 165 | static const int gaindelay[] = { 10, 20, 40, 80 }; |
171 | 166 | ||
@@ -303,7 +298,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
303 | { | 298 | { |
304 | const struct rti800_board *board = comedi_board(dev); | 299 | const struct rti800_board *board = comedi_board(dev); |
305 | struct rti800_private *devpriv; | 300 | struct rti800_private *devpriv; |
306 | unsigned int irq; | ||
307 | unsigned long iobase; | 301 | unsigned long iobase; |
308 | int ret; | 302 | int ret; |
309 | struct comedi_subdevice *s; | 303 | struct comedi_subdevice *s; |
@@ -317,15 +311,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
317 | inb(dev->iobase + RTI800_ADCHI); | 311 | inb(dev->iobase + RTI800_ADCHI); |
318 | outb(0, dev->iobase + RTI800_CLRFLAGS); | 312 | outb(0, dev->iobase + RTI800_CLRFLAGS); |
319 | 313 | ||
320 | irq = it->options[1]; | ||
321 | if (irq) { | ||
322 | ret = request_irq(irq, rti800_interrupt, 0, dev->board_name, | ||
323 | dev); | ||
324 | if (ret < 0) | ||
325 | return ret; | ||
326 | dev->irq = irq; | ||
327 | } | ||
328 | |||
329 | ret = comedi_alloc_subdevices(dev, 4); | 314 | ret = comedi_alloc_subdevices(dev, 4); |
330 | if (ret) | 315 | if (ret) |
331 | return ret; | 316 | return ret; |
@@ -425,8 +410,6 @@ static void rti800_detach(struct comedi_device *dev) | |||
425 | { | 410 | { |
426 | if (dev->iobase) | 411 | if (dev->iobase) |
427 | release_region(dev->iobase, RTI800_SIZE); | 412 | release_region(dev->iobase, RTI800_SIZE); |
428 | if (dev->irq) | ||
429 | free_irq(dev->irq, dev); | ||
430 | } | 413 | } |
431 | 414 | ||
432 | static struct comedi_driver rti800_driver = { | 415 | static struct comedi_driver rti800_driver = { |