From 11e480c3a64355b55ac23aaa3250fcc85f260530 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Aug 2015 10:45:07 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/me4000.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 60f62f3..c467eb7 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -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); -- 2.7.4