From: H Hartley Sweeten Date: Mon, 26 Jan 2015 23:17:14 +0000 (-0700) Subject: staging: comedi: das16: remove unnecessary das16_ai_disable() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fc4e02175285c4642f50ad7b4070848d9e9f63f8;p=openwrt%2Fstaging%2Fblogic.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- 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);