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

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

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



Use the new helpers in the step 3 tests of pcl812_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 d1e27594

drivers/staging/comedi/drivers/pcl812.c

+15 −43
Original line number Original line Diff line number Diff line
@@ -565,53 +565,25 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev, 
	if (err)

	if (err)

		return 2;

		return 2;





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

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





	if (cmd->start_arg != 0) {

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

		cmd->start_arg = 0;

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

		err++;

	}





	if (cmd->scan_begin_arg != 0) {

	if (cmd->convert_src == TRIG_TIMER)

		cmd->scan_begin_arg = 0;

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

		err++;

						 board->ai_ns_min);

	}

	else	/* TRIG_EXT */

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





	if (cmd->convert_src == TRIG_TIMER) {

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

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

	err |= cfc_check_trigger_arg_max(&cmd->chanlist_len, MAX_CHANLIST_LEN);

			cmd->convert_arg = board->ai_ns_min;

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

			err++;

		}

	} else {		/* TRIG_EXT */

		if (cmd->convert_arg != 0) {

			cmd->convert_arg = 0;

			err++;

		}

	}





	if (!cmd->chanlist_len) {

	if (cmd->stop_src == TRIG_COUNT)

		cmd->chanlist_len = 1;

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

		err++;

	else	/* TRIG_NONE */

	}

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

	if (cmd->chanlist_len > MAX_CHANLIST_LEN) {

		cmd->chanlist_len = board->n_aichan;

		err++;

	}

	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 (err)

	if (err)

		return 3;

		return 3;