[PATCH 3/7] staging: comedi: adl_pci9111: single source triggers are unique

H Hartley Sweeten hartleys at visionengravers.com
Tue Sep 11 17:47:52 UTC 2012


If a single source trigger passes "step 1" of the do_cmdtest function
they are already unique. There is no need to recheck them.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/adl_pci9111.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index ebd819e..152d682 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -369,9 +369,6 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev,
 	/*  step 2 : make sure trigger sources are unique and mutually
 	 *  compatible */
 
-	if (cmd->start_src != TRIG_NOW)
-		error++;
-
 	if ((cmd->scan_begin_src != TRIG_TIMER) &&
 	    (cmd->scan_begin_src != TRIG_FOLLOW) &&
 	    (cmd->scan_begin_src != TRIG_EXT))
@@ -388,9 +385,6 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev,
 	      (cmd->scan_begin_src == TRIG_FOLLOW)))
 		error++;
 
-
-	if (cmd->scan_end_src != TRIG_COUNT)
-		error++;
 	if ((cmd->stop_src != TRIG_COUNT) && (cmd->stop_src != TRIG_NONE))
 		error++;
 
-- 
1.7.11




More information about the devel mailing list