staging: comedi: comedi_test: trigger sources are validated in (*do_cmdtest)
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 10 Feb 2014 22:20:34 +0000 (15:20 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Feb 2014 17:31:30 +0000 (09:31 -0800)
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>
drivers/staging/comedi/drivers/comedi_test.c

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