From 193e43fdb776e11c93b70cec9bf46970b93a4d76 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 13 Nov 2012 17:56:41 -0700
Subject: [PATCH] --- yaml --- r: 337923 b: refs/heads/master c:
 ec3ffe6d423d7b05527371815f9d5530a4c895fd h: refs/heads/master i:   337921:
 4c3909267d250a6d5ec92e82bb88bd9da100a2df   337919:
 69910e8087cd05a8058aafc312ec50b7273ccc8a v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/ni_atmio16d.c      | 43 ++++++-------------
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index df4293074f6f..70866055f0aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd254844f1dff6ee1b3be499b2730a4ff1d9ca51
+refs/heads/master: ec3ffe6d423d7b05527371815f9d5530a4c895fd
diff --git a/trunk/drivers/staging/comedi/drivers/ni_atmio16d.c b/trunk/drivers/staging/comedi/drivers/ni_atmio16d.c
index a3884b4d90c6..4a17494f55ed 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_atmio16d.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_atmio16d.c
@@ -271,51 +271,32 @@ static int atmio16d_ai_cmdtest(struct comedi_device *dev,
 	if (err)
 		return 2;
 
-	/* step 3: make sure arguments are trivially compatible */
+	/* Step 3: check if arguments are trivially valid */
+
+	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-	if (cmd->start_arg != 0) {
-		cmd->start_arg = 0;
-		err++;
-	}
 	if (cmd->scan_begin_src == TRIG_FOLLOW) {
 		/* internal trigger */
-		if (cmd->scan_begin_arg != 0) {
-			cmd->scan_begin_arg = 0;
-			err++;
-		}
+		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 	} else {
 #if 0
 		/* external trigger */
 		/* should be level/edge, hi/lo specification here */
-		if (cmd->scan_begin_arg != 0) {
-			cmd->scan_begin_arg = 0;
-			err++;
-		}
+		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 #endif
 	}
 
-	if (cmd->convert_arg < 10000) {
-		cmd->convert_arg = 10000;
-		err++;
-	}
+	err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 10000);
 #if 0
-	if (cmd->convert_arg > SLOWEST_TIMER) {
-		cmd->convert_arg = SLOWEST_TIMER;
-		err++;
-	}
+	err |= cfc_check_trigger_arg_max(&cmd->convert_arg, SLOWEST_TIMER);
 #endif
-	if (cmd->scan_end_arg != cmd->chanlist_len) {
-		cmd->scan_end_arg = cmd->chanlist_len;
-		err++;
-	}
+
+	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
 	if (cmd->stop_src == TRIG_COUNT) {
 		/* any count is allowed */
-	} else {
-		/* TRIG_NONE */
-		if (cmd->stop_arg != 0) {
-			cmd->stop_arg = 0;
-			err++;
-		}
+	} else {	/* TRIG_NONE */
+		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 	}
 
 	if (err)