hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2015-08-05 10:45:07 -07:00 committed by Greg Kroah-Hartman
parent 272e426ebc
commit 11e480c3a6
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/comedi/drivers/me4000.c
View File

@ -681,12 +681,18 @@ static int me4000_ai_write_chanlist(struct comedi_device *dev,
return 0; return 0;
} }
static int ai_prepare(struct comedi_device *dev, static int me4000_ai_do_cmd(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s)
struct comedi_cmd *cmd)
{ {
struct me4000_private *devpriv = dev->private; struct me4000_private *devpriv = dev->private;
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 */
ai_write_timer(dev); ai_write_timer(dev);
@ -718,25 +724,6 @@ static int ai_prepare(struct comedi_device *dev,
/* Write the channel list */ /* Write the channel list */
me4000_ai_write_chanlist(dev, s, cmd); 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 */ /* Start acquistion by dummy read */
inl(dev->iobase + ME4000_AI_START_REG); inl(dev->iobase + ME4000_AI_START_REG);