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

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

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



Use the new helpers in the step 3 tests of comedi_pcm_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 5f93c88f

drivers/staging/comedi/drivers/pcm_common.c

+6 −28
Original line number Diff line number Diff line
@@ -29,41 +29,19 @@ int comedi_pcm_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 */



	/* cmd->start_src == TRIG_NOW || cmd->start_src == TRIG_INT */

	if (cmd->start_arg != 0) {

		cmd->start_arg = 0;

		err++;

	}



	/* cmd->scan_begin_src == TRIG_EXT */

	if (cmd->scan_begin_arg != 0) {

		cmd->scan_begin_arg = 0;

		err++;

	}



	/* cmd->convert_src == TRIG_NOW */

	if (cmd->convert_arg != 0) {

		cmd->convert_arg = 0;

		err++;

	}



	/* cmd->scan_end_src == TRIG_COUNT */

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

		cmd->scan_end_arg = cmd->chanlist_len;

		err++;

	}

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

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

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

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



	switch (cmd->stop_src) {

	case TRIG_COUNT:

		/* any count allowed */

		break;

	case TRIG_NONE:

		if (cmd->stop_arg != 0) {

			cmd->stop_arg = 0;

			err++;

		}

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

		break;

	default:

		break;