From 83cc04e661d40087e53fd61e1de650ff6caf4016 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 13 Nov 2012 17:50:51 -0700
Subject: [PATCH] --- yaml --- r: 337903 b: refs/heads/master c:
 50b825ffa3f3c16d273e396f8a2977d2a76da2fd h: refs/heads/master i:   337901:
 cf79c67feb784db1e4d9cfd39276a720b32edf52   337899:
 b7a12f525c50251eda5507ba1ac0c2065e2d9d19   337895:
 c14d5a2a04ffe7eb2ce80b7bc2a8e83c0ab4715d   337887:
 98f5c4858a9c24ddbfc0c373ae52e851264bff0a v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/das800.c | 44 ++++++-------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index 6fe83cb011dc..7caa39bec302 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c563065bb15177f88b346837331cbe77dbe43b40
+refs/heads/master: 50b825ffa3f3c16d273e396f8a2977d2a76da2fd
diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c
index 85ab24c4556a..38f625be812a 100644
--- a/trunk/drivers/staging/comedi/drivers/das800.c
+++ b/trunk/drivers/staging/comedi/drivers/das800.c
@@ -622,37 +622,21 @@ static int das800_ai_do_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 */
 
-	if (cmd->start_arg != 0) {
-		cmd->start_arg = 0;
-		err++;
-	}
-	if (cmd->convert_src == TRIG_TIMER) {
-		if (cmd->convert_arg < thisboard->ai_speed) {
-			cmd->convert_arg = thisboard->ai_speed;
-			err++;
-		}
-	}
-	if (!cmd->chanlist_len) {
-		cmd->chanlist_len = 1;
-		err++;
-	}
-	if (cmd->scan_end_arg != cmd->chanlist_len) {
-		cmd->scan_end_arg = cmd->chanlist_len;
-		err++;
-	}
-	if (cmd->stop_src == TRIG_COUNT) {
-		if (!cmd->stop_arg) {
-			cmd->stop_arg = 1;
-			err++;
-		}
-	} else {		/* TRIG_NONE */
-		if (cmd->stop_arg != 0) {
-			cmd->stop_arg = 0;
-			err++;
-		}
-	}
+	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+	if (cmd->convert_src == TRIG_TIMER)
+		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+						 thisboard->ai_speed);
+
+	err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+	if (cmd->stop_src == TRIG_COUNT)
+		err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+	else	/* TRIG_NONE */
+		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
 	if (err)
 		return 3;