From e9ad322cc971fa15b49172b473e469974ba6262d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 13 Nov 2012 17:49:05 -0700
Subject: [PATCH] --- yaml --- r: 337897 b: refs/heads/master c:
 58bed93eebeea7708f42da8f2bcb40a035004713 h: refs/heads/master i:   337895:
 c14d5a2a04ffe7eb2ce80b7bc2a8e83c0ab4715d v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/addi_apci_1032.c   | 27 +++++--------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 100faa8f762e..60a262ba510f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2404271050e9cda4243876c9e3e8ff51e1fc1c09
+refs/heads/master: 58bed93eebeea7708f42da8f2bcb40a035004713
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c
index dc285307a636..eb31375e72e6 100644
--- a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -154,28 +154,13 @@ static int apci1032_cos_cmdtest(struct comedi_device *dev,
 	if (err)
 		return 2;
 
-	/* step 3: */
+	/* 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;