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

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

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



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

drivers/staging/comedi/drivers/dt2814.c

+13 −29
Original line number Original line Diff line number Diff line
@@ -149,36 +149,20 @@ static int dt2814_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++;

	err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 1000000000);

	}

	err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

	if (cmd->scan_begin_arg > 1000000000) {

					 DT2814_MAX_SPEED);

		cmd->scan_begin_arg = 1000000000;



		err++;

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

	}



	if (cmd->scan_begin_arg < DT2814_MAX_SPEED) {

	if (cmd->stop_src == TRIG_COUNT)

		cmd->scan_begin_arg = DT2814_MAX_SPEED;

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

		err++;

	else	/* TRIG_NONE */

	}

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

	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 < 2) {

			cmd->stop_arg = 2;

			err++;

		}

	} else {

		/* TRIG_NONE */

		if (cmd->stop_arg != 0) {

			cmd->stop_arg = 0;

			err++;

		}

	}





	if (err)

	if (err)

		return 3;

		return 3;