From 50997025ec058b0c3b619e38a132fd525c4873aa Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 25 Oct 2012 17:26:54 -0700
Subject: [PATCH] --- yaml --- r: 337311 b: refs/heads/master c:
 d3bf2177c85f15a10c715cb0225311992503e8eb h: refs/heads/master i:   337309:
 70eb234da0a92eae5a582ce2466acf68b9caaf34   337307:
 42491eb6c3b46a0c91e0bd30f466df1d22a63008   337303:
 492f5ade6317d1f48d468c3f2825dc26257bbe00   337295:
 457ef99d207ca0e479437af9cc9f9c69612d41bc   337279:
 0bc01feace0e9986c848f6c65f209abd8dc26c23 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/dt3000.c | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index bbb21d5d5f20..1d65c56a1bb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f26d8b70b4ac22646388b7c58ec3d9f97d4e0f9f
+refs/heads/master: d3bf2177c85f15a10c715cb0225311992503e8eb
diff --git a/trunk/drivers/staging/comedi/drivers/dt3000.c b/trunk/drivers/staging/comedi/drivers/dt3000.c
index dba54844372c..d54b91cba9b8 100644
--- a/trunk/drivers/staging/comedi/drivers/dt3000.c
+++ b/trunk/drivers/staging/comedi/drivers/dt3000.c
@@ -488,9 +488,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
 			cmd->scan_begin_arg = 100 * 16 * 65535;
 			err++;
 		}
-	} else {
-		/* not supported */
 	}
+
 	if (cmd->convert_src == TRIG_TIMER) {
 		if (cmd->convert_arg < this_board->ai_speed) {
 			cmd->convert_arg = this_board->ai_speed;
@@ -500,8 +499,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
 			cmd->convert_arg = 50 * 16 * 65535;
 			err++;
 		}
-	} else {
-		/* not supported */
 	}
 
 	if (cmd->scan_end_arg != cmd->chanlist_len) {
@@ -532,9 +529,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
 				 cmd->flags & TRIG_ROUND_MASK);
 		if (tmp != cmd->scan_begin_arg)
 			err++;
-	} else {
-		/* not supported */
 	}
+
 	if (cmd->convert_src == TRIG_TIMER) {
 		tmp = cmd->convert_arg;
 		dt3k_ns_to_timer(50, &cmd->convert_arg,
@@ -548,8 +544,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
 			    cmd->convert_arg * cmd->scan_end_arg;
 			err++;
 		}
-	} else {
-		/* not supported */
 	}
 
 	if (err)
@@ -585,8 +579,6 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 					   cmd->flags & TRIG_ROUND_MASK);
 		writew((divider >> 16), devpriv->io_addr + DPR_Params(1));
 		writew((divider & 0xffff), devpriv->io_addr + DPR_Params(2));
-	} else {
-		/* not supported */
 	}
 
 	if (cmd->scan_begin_src == TRIG_TIMER) {
@@ -594,8 +586,6 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 					    cmd->flags & TRIG_ROUND_MASK);
 		writew((tscandiv >> 16), devpriv->io_addr + DPR_Params(3));
 		writew((tscandiv & 0xffff), devpriv->io_addr + DPR_Params(4));
-	} else {
-		/* not supported */
 	}
 
 	mode = DT3000_AD_RETRIG_INTERNAL | 0 | 0;