Commit 8f266f47 authored Apr 23, 2014 by H Hartley Sweeten Committed by Greg Kroah-Hartman Apr 25, 2014

staging: comedi: me4000: remove unnecessary Step 2b test in (*do_cmdtest)

This test is unnecessary. It covers all the possible combinations of the
scan_end_src and stop_src triggers so the final else can never be reached.

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>

parent a5c9c71f

drivers/staging/comedi/drivers/me4000.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -902,17 +902,6 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
		err \|= -EINVAL;
		}

		if (cmd->stop_src == TRIG_NONE && cmd->scan_end_src == TRIG_NONE) {
		} else if (cmd->stop_src == TRIG_COUNT &&
		cmd->scan_end_src == TRIG_NONE) {
		} else if (cmd->stop_src == TRIG_NONE &&
		cmd->scan_end_src == TRIG_COUNT) {
		} else if (cmd->stop_src == TRIG_COUNT &&
		cmd->scan_end_src == TRIG_COUNT) {
		} else {
		err \|= -EINVAL;
		}

		if (err)
		return 2;