Commit 11e480c3 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: me4000: absorb ai_prepare()

This function never fails and it's only called by me4000_ai_do_cmd().

Absorb it and remove the unnecessary failure check.
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 272e426e
......@@ -681,12 +681,18 @@ static int me4000_ai_write_chanlist(struct comedi_device *dev,
return 0;
}
static int ai_prepare(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
static int me4000_ai_do_cmd(struct comedi_device *dev,
struct comedi_subdevice *s)
{
struct me4000_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
unsigned int ctrl;
int err;
/* Reset the analog input */
err = me4000_ai_cancel(dev, s);
if (err)
return err;
/* Write timer arguments */
ai_write_timer(dev);
......@@ -718,25 +724,6 @@ static int ai_prepare(struct comedi_device *dev,
/* Write the channel list */
me4000_ai_write_chanlist(dev, s, cmd);
return 0;
}
static int me4000_ai_do_cmd(struct comedi_device *dev,
struct comedi_subdevice *s)
{
int err;
struct comedi_cmd *cmd = &s->async->cmd;
/* Reset the analog input */
err = me4000_ai_cancel(dev, s);
if (err)
return err;
/* Prepare the AI for acquisition */
err = ai_prepare(dev, s, cmd);
if (err)
return err;
/* Start acquistion by dummy read */
inl(dev->iobase + ME4000_AI_START_REG);
......
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