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

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

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



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

drivers/staging/comedi/drivers/ni_65xx.c

+6 −22
Original line number Diff line number Diff line
@@ -504,29 +504,13 @@ static int ni_65xx_intr_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 */



	if (cmd->start_arg != 0) {

		cmd->start_arg = 0;

		err++;

	}

	if (cmd->scan_begin_arg != 0) {

		cmd->scan_begin_arg = 0;

		err++;

	}

	if (cmd->convert_arg != 0) {

		cmd->convert_arg = 0;

		err++;

	}



	if (cmd->scan_end_arg != 1) {

		cmd->scan_end_arg = 1;

		err++;

	}

	if (cmd->stop_arg != 0) {

		cmd->stop_arg = 0;

		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, 1);

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



	if (err)

		return 3;