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

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



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

drivers/staging/comedi/drivers/ni_labpc.c

+16 −38
Original line number Original line Diff line number Diff line
@@ -1026,56 +1026,34 @@ static int labpc_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 == TRIG_NOW && cmd->start_arg != 0) {

	if (cmd->start_arg == TRIG_NOW)

		cmd->start_arg = 0;

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

		err++;

	}





	if (!cmd->chanlist_len)

	if (!cmd->chanlist_len)

		err++;

		err |= -EINVAL;

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





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

	if (cmd->convert_src == TRIG_TIMER)

		cmd->scan_end_arg = cmd->chanlist_len;

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

		err++;

						 thisboard->ai_speed);

	}





	if (cmd->convert_src == TRIG_TIMER) {

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

			cmd->convert_arg = thisboard->ai_speed;

			err++;

		}

	}

	/* make sure scan timing is not too fast */

	/* make sure scan timing is not too fast */

	if (cmd->scan_begin_src == TRIG_TIMER) {

	if (cmd->scan_begin_src == TRIG_TIMER) {

		if (cmd->convert_src == TRIG_TIMER &&

		if (cmd->convert_src == TRIG_TIMER)

		    cmd->scan_begin_arg <

			err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

		    cmd->convert_arg * cmd->chanlist_len) {

					cmd->convert_arg * cmd->chanlist_len);

			cmd->scan_begin_arg =

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

			    cmd->convert_arg * cmd->chanlist_len;

				thisboard->ai_speed * cmd->chanlist_len);

			err++;

		}

		if (cmd->scan_begin_arg <

		    thisboard->ai_speed * cmd->chanlist_len) {

			cmd->scan_begin_arg =

			    thisboard->ai_speed * cmd->chanlist_len;

			err++;

		}

	}

	}

	/* stop source */



	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;

		/*

		/*

		 * TRIG_EXT doesn't care since it doesn't

		 * TRIG_EXT doesn't care since it doesn't