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

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

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



Use the new helpers in the step 3 tests of dt3k_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 61e55b88

drivers/staging/comedi/drivers/dt3000.c

+16 −37
Original line number Original line Diff line number Diff line
@@ -468,51 +468,30 @@ static int dt3k_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++;

	}





	if (cmd->scan_begin_src == TRIG_TIMER) {

	if (cmd->scan_begin_src == TRIG_TIMER) {

		if (cmd->scan_begin_arg < this_board->ai_speed) {

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

			cmd->scan_begin_arg = this_board->ai_speed;

						 this_board->ai_speed);

			err++;

		err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,

		}

						 100 * 16 * 65535);

		if (cmd->scan_begin_arg > 100 * 16 * 65535) {

			cmd->scan_begin_arg = 100 * 16 * 65535;

			err++;

		}

	}

	}





	if (cmd->convert_src == TRIG_TIMER) {

	if (cmd->convert_src == TRIG_TIMER) {

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

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

			cmd->convert_arg = this_board->ai_speed;

						 this_board->ai_speed);

			err++;

		err |= cfc_check_trigger_arg_max(&cmd->convert_arg,

		}

						 50 * 16 * 65535);

		if (cmd->convert_arg > 50 * 16 * 65535) {

			cmd->convert_arg = 50 * 16 * 65535;

			err++;

		}

	}

	}





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

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

		cmd->scan_end_arg = cmd->chanlist_len;



		err++;

	if (cmd->stop_src == TRIG_COUNT)

	}

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

	if (cmd->stop_src == TRIG_COUNT) {

	else	/* TRIG_NONE */

		if (cmd->stop_arg > 0x00ffffff) {

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

			cmd->stop_arg = 0x00ffffff;

			err++;

		}

	} else {

		/* TRIG_NONE */

		if (cmd->stop_arg != 0) {

			cmd->stop_arg = 0;

			err++;

		}

	}





	if (err)

	if (err)

		return 3;

		return 3;