Commit 2ff848c3 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: me4000: remove unnecessary me4000_ai_cancel()

The comedi core ensures that the subdevice is not busy before it allows
starting a new command. The subdevice (*cancel) is called when the
subdevice is set to not busy. In this driver the me4000_ai_cancel()
is the ai (*cancel) so the extra call in the ai (*do_cmd) is not
necessary. Remove it.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78e4a573
...@@ -665,12 +665,6 @@ static int me4000_ai_do_cmd(struct comedi_device *dev, ...@@ -665,12 +665,6 @@ static int me4000_ai_do_cmd(struct comedi_device *dev,
struct me4000_private *devpriv = dev->private; struct me4000_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
unsigned int ctrl; unsigned int ctrl;
int err;
/* Reset the analog input */
err = me4000_ai_cancel(dev, s);
if (err)
return err;
/* Write timer arguments */ /* Write timer arguments */
outl(devpriv->ai_init_ticks - 1, outl(devpriv->ai_init_ticks - 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment