From 7eb9309165e56029bded20b4b2769f1fd38f5b92 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 13 Nov 2012 17:54:41 -0700
Subject: [PATCH] --- yaml --- r: 337915 b: refs/heads/master c:
 35402007dd9ad3a05350a0815aa2e1ca7dba77d5 h: refs/heads/master i:   337913:
 17fdf48f25f56ee23fbc061883c10aa08f987fca   337911:
 e507bd4446740ecec28125d65dcb3044fa1bd5c1 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/comedi/drivers/das1800.c  | 38 ++++++-------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 991bf5c28106..e5fd86ddf638 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 050b3b1830386e5c8884804b841d4e83c57cf0de
+refs/heads/master: 35402007dd9ad3a05350a0815aa2e1ca7dba77d5
diff --git a/trunk/drivers/staging/comedi/drivers/das1800.c b/trunk/drivers/staging/comedi/drivers/das1800.c
index 2495cd914793..7900f959555d 100644
--- a/trunk/drivers/staging/comedi/drivers/das1800.c
+++ b/trunk/drivers/staging/comedi/drivers/das1800.c
@@ -824,39 +824,23 @@ static int das1800_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++;
-	}
+	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);
 
 	switch (cmd->stop_src) {
 	case TRIG_COUNT:
-		if (!cmd->stop_arg) {
-			cmd->stop_arg = 1;
-			err++;
-		}
+		err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
 		break;
 	case TRIG_NONE:
-		if (cmd->stop_arg != 0) {
-			cmd->stop_arg = 0;
-			err++;
-		}
+		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 		break;
 	default:
 		break;