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

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

diff --git a/[refs] b/[refs]
index c5c7881eb2d0..70f78032689f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1d6de5a9807ae45e5fbd167c8568c0e9fca71f0
+refs/heads/master: 7efbbc37db3ced8bde7ed68b04a17fd716deb586
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pc236.c b/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
index ae75754dd777..d460b243f37b 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -331,28 +331,13 @@ static int pc236_intr_cmdtest(struct comedi_device *dev,
 	if (err)
 		return 2;
 
-	/* step 3: */
+	/* Step 3: check it 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;