summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/das16.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2015-01-26 16:17:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-28 11:14:04 -0800
commitfc4e02175285c4642f50ad7b4070848d9e9f63f8 (patch)
treea2139e2cec64ea2b247520ad6a6d9f7ff7575e14 /drivers/staging/comedi/drivers/das16.c
parent7157fda400c7aeeee1eb60d4c6fd31cef822dac0 (diff)
staging: comedi: das16: remove unnecessary das16_ai_disable()
The das16_ai_disable() function disables interrupts and the pacer clock. This function is called by the subdevice (*cancel) operation. The comedi core will not call a subdevice (*insn_read) operation while an async command is running due to the s->busy check in parse_insn(). Since all async commands are terminated by a (*cancel), the das16_ai_disable() is not necessary in das16_ai_insn_read(). Remove it. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/das16.c')
-rw-r--r--drivers/staging/comedi/drivers/das16.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 417ea755f42b..97e5e7dca954 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -831,8 +831,6 @@ static int das16_ai_insn_read(struct comedi_device *dev,
int ret;
int i;
- das16_ai_disable(dev);
-
/* set multiplexer */
outb(chan | (chan << 4), dev->iobase + DAS16_MUX_REG);