evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: comedi_test: trigger sources are validated in (*do_cmdtest)

Browse source 
The trigger sources were already validataed in the (*do_cmdtest) before the
(*do_cmd) is called. Refactor the code in waveform_ai_cmd() to remove the
final else which can never be reached.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-02-10 15:20:34 -07:00 • committed by Greg Kroah-Hartman
parent 8abc7287f6
commit f45cc79ae5
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/comedi/drivers/comedi_test.c
View file

@ -318,12 +318,8 @@ static int waveform_ai_cmd(struct comedi_device *dev,
if (cmd->convert_src == TRIG_NOW) if (cmd->convert_src == TRIG_NOW)
devpriv->convert_period = 0; devpriv->convert_period = 0;
else if (cmd->convert_src == TRIG_TIMER) else /* TRIG_TIMER */
devpriv->convert_period = cmd->convert_arg / nano_per_micro; devpriv->convert_period = cmd->convert_arg / nano_per_micro;
else {
comedi_error(dev, "bug setting conversion period");
return -1;
}
do_gettimeofday(&devpriv->last); do_gettimeofday(&devpriv->last);
devpriv->usec_current = devpriv->last.tv_usec % devpriv->usec_period; devpriv->usec_current = devpriv->last.tv_usec % devpriv->usec_period;