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

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

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



Use the new helpers in the step 3 tests of a2150_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 8c6c5a69

drivers/staging/comedi/drivers/ni_at_a2150.c

+14 −30
Original line number Diff line number Diff line
@@ -345,37 +345,21 @@ static int a2150_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++;

	}

	if (cmd->convert_src == TRIG_TIMER) {

		if (cmd->convert_arg < thisboard->ai_speed) {

			cmd->convert_arg = thisboard->ai_speed;

			err++;

		}

	}

	if (!cmd->chanlist_len) {

		cmd->chanlist_len = 1;

		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++;

		}

	}

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



	if (cmd->convert_src == TRIG_TIMER)

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

						 thisboard->ai_speed);



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

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



	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;