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

Commit 8531fce9 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_src 



Use the helper function cfc_check_trigger_src for the "step 1"
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 60a63228

drivers/staging/comedi/drivers/adv_pci1710.c

+6 −24
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ Configuration options: 


#include "../comedidev.h"



#include "comedi_fc.h"

#include "8253.h"

#include "amcc_s5933.h"
@@ -1047,30 +1048,11 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, 


	/* step 1: make sure trigger sources are trivially valid */



	tmp = cmd->start_src;

	cmd->start_src &= TRIG_NOW | TRIG_EXT;

	if (!cmd->start_src || tmp != cmd->start_src)

		err++;



	tmp = cmd->scan_begin_src;

	cmd->scan_begin_src &= TRIG_FOLLOW;

	if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)

		err++;



	tmp = cmd->convert_src;

	cmd->convert_src &= TRIG_TIMER | TRIG_EXT;

	if (!cmd->convert_src || tmp != cmd->convert_src)

		err++;



	tmp = cmd->scan_end_src;

	cmd->scan_end_src &= TRIG_COUNT;

	if (!cmd->scan_end_src || tmp != cmd->scan_end_src)

		err++;



	tmp = cmd->stop_src;

	cmd->stop_src &= TRIG_COUNT | TRIG_NONE;

	if (!cmd->stop_src || tmp != cmd->stop_src)

		err++;

	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_FOLLOW);

	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_TIMER | TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);



	if (err)

		return 1;