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

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

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



Use the new helpers in the step 3 tests of di_cmd_test().

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 39c7bba8

drivers/staging/comedi/drivers/gsc_hpdi.c

+5 −14
Original line number Diff line number Diff line
@@ -641,29 +641,20 @@ static int di_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, 
	if (err)

		return 2;



	/* step 3: make sure arguments are trivially compatible */

	/* Step 3: check if arguments are trivially valid */



	if (!cmd->chanlist_len) {

		cmd->chanlist_len = 32;

		err++;

	}

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

		cmd->scan_end_arg = cmd->chanlist_len;

		err++;

		err |= -EINVAL;

	}

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



	switch (cmd->stop_src) {

	case TRIG_COUNT:

		if (!cmd->stop_arg) {

			cmd->stop_arg = 1;

			err++;

		}

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

		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;