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

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

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



Use the new helpers in the step 3 tests of das1800_ai_do_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 050b3b18

drivers/staging/comedi/drivers/das1800.c

+11 −27
Original line number Original line Diff line number Diff line
@@ -824,39 +824,23 @@ static int das1800_ai_do_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->convert_src == TRIG_TIMER)

	}

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

	if (cmd->convert_src == TRIG_TIMER) {

						 thisboard->ai_speed);

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



			cmd->convert_arg = thisboard->ai_speed;

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

			err++;

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

		}

	}

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

	}





	switch (cmd->stop_src) {

	switch (cmd->stop_src) {

	case TRIG_COUNT:

	case TRIG_COUNT:

		if (!cmd->stop_arg) {

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

			cmd->stop_arg = 1;

			err++;

		}

		break;

		break;

	case TRIG_NONE:

	case TRIG_NONE:

		if (cmd->stop_arg != 0) {

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

			cmd->stop_arg = 0;

			err++;

		}

		break;

		break;

	default:

	default:

		break;

		break;