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

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

staging: comedi: adv_pci1710: use cfc_check_trigger_is_unique 



Use the helper function cfc_check_trigger_is_unique for the "step 2a"
tests of pci171x_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 85f3088b

drivers/staging/comedi/drivers/adv_pci1710.c

+5 −10
Original line number Diff line number Diff line
@@ -1057,18 +1057,13 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, 
	if (err)

		return 1;



	/* step2: make sure trigger srcs are unique and mutually compatible */

	/* step 2a: make sure trigger sources are unique */



	if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) {

		cmd->start_src = TRIG_NOW;

		err++;

	}

	err |= cfc_check_trigger_is_unique(cmd->start_src);

	err |= cfc_check_trigger_is_unique(cmd->convert_src);

	err |= cfc_check_trigger_is_unique(cmd->stop_src);



	if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT)

		err++;



	if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)

		err++;

	/* step 2b: and mutually compatible */



	if (err)

		return 2;