From 8db901ecc1233e479d90af07d8d0febe47216e26 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 13 Nov 2012 17:48:41 -0700
Subject: [PATCH] --- yaml --- r: 337896 b: refs/heads/master c:
 2404271050e9cda4243876c9e3e8ff51e1fc1c09 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 02895058e79e..100faa8f762e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 851eef809c50d79e13e44fbd2b35b58fab0d4932
+refs/heads/master: 2404271050e9cda4243876c9e3e8ff51e1fc1c09
diff --git a/trunk/drivers/staging/comedi/drivers/comedi_parport.c b/trunk/drivers/staging/comedi/drivers/comedi_parport.c
index 6d3b56a70aa9..76d59dcbea07 100644
--- a/trunk/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/trunk/drivers/staging/comedi/drivers/comedi_parport.c
@@ -196,28 +196,13 @@ static int parport_intr_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;