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

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

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



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

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 1b443313

drivers/staging/comedi/drivers/adv_pci1710.c

+13 −35
Original line number Diff line number Diff line
@@ -1066,45 +1066,23 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, 
	if (err)

		return 2;



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

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



	if (cmd->start_arg != 0) {

		cmd->start_arg = 0;

		err++;

	}

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

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



	if (cmd->scan_begin_arg != 0) {

		cmd->scan_begin_arg = 0;

		err++;

	}

	if (cmd->convert_src == TRIG_TIMER)

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

						 this_board->ai_ns_min);

	else	/* TRIG_FOLLOW */

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



	if (cmd->convert_src == TRIG_TIMER) {

		if (cmd->convert_arg < this_board->ai_ns_min) {

			cmd->convert_arg = this_board->ai_ns_min;

			err++;

		}

	} else {		/* TRIG_FOLLOW */

		if (cmd->convert_arg != 0) {

			cmd->convert_arg = 0;

			err++;

		}

	}

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



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

		cmd->scan_end_arg = cmd->chanlist_len;

		err++;

	}

	if (cmd->stop_src == TRIG_COUNT) {

		if (!cmd->stop_arg) {

			cmd->stop_arg = 1;

			err++;

		}

	} else {		/* TRIG_NONE */

		if (cmd->stop_arg != 0) {

			cmd->stop_arg = 0;

			err++;

		}

	}

	if (cmd->stop_src == TRIG_COUNT)

		err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);

	else	/* TRIG_NONE */

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



	if (err)

		return 3;