From ee40a1ffa830549f7fbdc301abe4757d1ff4e387 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 11 Sep 2012 10:47:33 -0700
Subject: [PATCH] --- yaml --- r: 325151 b: refs/heads/master c:
 97e01bb10a193b1d8592303d8858192ee9ea32f7 h: refs/heads/master i:   325149:
 1f6d508b1110b2ca09076fdb85ef80047f16d604   325147:
 ad2dcc0f98ef322628ba2618a53dd68dece5c36d   325143:
 2f7b9a6fdb419fe62f43a79c33990e67583b32d8   325135:
 7564c49091c47d01270fbd81c80df7d340a5728e   325119:
 4aef51d4ae2409b6d3dac340003bbf48582c0b5b v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/adl_pci9111.c      | 31 +++++++------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 22e5140292a2..a96bc785c5fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43b9778eeb789fbfad3ce66da3bbb3440440fbb8
+refs/heads/master: 97e01bb10a193b1d8592303d8858192ee9ea32f7
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
index 7cf015e65406..ebd819ef967e 100644
--- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -342,18 +342,9 @@ static int pci9111_ai_cancel(struct comedi_device *dev,
 	return 0;
 }
 
-/*  Test analog input command */
-
-#define pci9111_check_trigger_src(src, flags)	do {			\
-		tmp = src;						\
-		src &= flags;						\
-		if (!src || tmp != src)					\
-			error++;					\
-	} while (false);
-
-static int
-pci9111_ai_do_cmd_test(struct comedi_device *dev,
-		       struct comedi_subdevice *s, struct comedi_cmd *cmd)
+static int pci9111_ai_do_cmd_test(struct comedi_device *dev,
+				  struct comedi_subdevice *s,
+				  struct comedi_cmd *cmd)
 {
 	struct pci9111_private_data *dev_private = dev->private;
 	int tmp;
@@ -361,14 +352,16 @@ pci9111_ai_do_cmd_test(struct comedi_device *dev,
 	int range, reference;
 	int i;
 
-	/*  Step 1 : check if trigger are trivialy valid */
+	/* Step 1 : check if trigger are trivialy valid */
 
-	pci9111_check_trigger_src(cmd->start_src, TRIG_NOW);
-	pci9111_check_trigger_src(cmd->scan_begin_src,
-				  TRIG_TIMER | TRIG_FOLLOW | TRIG_EXT);
-	pci9111_check_trigger_src(cmd->convert_src, TRIG_TIMER | TRIG_EXT);
-	pci9111_check_trigger_src(cmd->scan_end_src, TRIG_COUNT);
-	pci9111_check_trigger_src(cmd->stop_src, TRIG_COUNT | TRIG_NONE);
+	error |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW);
+	error |= cfc_check_trigger_src(&cmd->scan_begin_src,
+					TRIG_TIMER | TRIG_FOLLOW | TRIG_EXT);
+	error |= cfc_check_trigger_src(&cmd->convert_src,
+					TRIG_TIMER | TRIG_EXT);
+	error |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
+	error |= cfc_check_trigger_src(&cmd->stop_src,
+					TRIG_COUNT | TRIG_NONE);
 
 	if (error)
 		return 1;