Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 050b3b18 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das16m1: use cfc_check_trigger_arg_*() helpers 



Use the new helpers in the step 3 tests of das16m1_cmd_test().

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a48e1258

drivers/staging/comedi/drivers/das16m1.c

+9 −26
Original line number Diff line number Diff line
@@ -186,40 +186,23 @@ static int das16m1_cmd_test(struct comedi_device *dev, 
	if (err)

		return 2;



	/* step 3: make sure arguments are trivially compatible */

	if (cmd->start_arg != 0) {

		cmd->start_arg = 0;

		err++;

	}

	/* Step 3: check if arguments are trivially valid */



	if (cmd->scan_begin_src == TRIG_FOLLOW) {

		/* internal trigger */

		if (cmd->scan_begin_arg != 0) {

			cmd->scan_begin_arg = 0;

			err++;

		}

	}

	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);



	if (cmd->convert_src == TRIG_TIMER) {

		if (cmd->convert_arg < 1000) {

			cmd->convert_arg = 1000;

			err++;

		}

	}

	if (cmd->scan_begin_src == TRIG_FOLLOW)	/* internal trigger */

		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);



	if (cmd->scan_end_arg != cmd->chanlist_len) {

		cmd->scan_end_arg = cmd->chanlist_len;

		err++;

	}

	if (cmd->convert_src == TRIG_TIMER)

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 1000);



	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);



	if (cmd->stop_src == TRIG_COUNT) {

		/* any count is allowed */

	} else {

		/* TRIG_NONE */

		if (cmd->stop_arg != 0) {

			cmd->stop_arg = 0;

			err++;

		}

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

	}



	if (err)