From 677788acd5a32fc2ddef0f5b3a70b92b1419022d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 7 Sep 2012 17:49:37 -0700
Subject: [PATCH] --- yaml --- r: 324975 b: refs/heads/master c:
 83eef17c7845d08eb40e5792ed40b387eb555bdd h: refs/heads/master i:   324973:
 a363d330f189f6775f744f7efbd2847e63b59ca5   324971:
 06165042580f6793d7ba6d79a088ef479458541d   324967:
 5a0bc6dd41716838c23c8b614ec1af5c5ee3ccc8   324959:
 a9d0ad531b3c985d05dec8a02093de9f1372e5b0 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/me4000.c | 51 ++++---------------
 2 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/[refs] b/[refs]
index 08016e96b867..918d2a987040 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db9132e03054f1332952961ecc0db4fa955a46a5
+refs/heads/master: 83eef17c7845d08eb40e5792ed40b387eb555bdd
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
index 27535cc95a5c..4ba0835b137f 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.c
+++ b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -1510,69 +1510,38 @@ static int me4000_dio_insn_config(struct comedi_device *dev,
   Counter section
   ===========================================================================*/
 
-static int cnt_reset(struct comedi_device *dev, unsigned int channel)
-{
-	struct me4000_info *info = dev->private;
-
-	i8254_load(info->timer_regbase, 0, channel, 0,
-			I8254_MODE0 | I8254_BINARY);
-
-	return 0;
-}
-
-static int cnt_config(struct comedi_device *dev, unsigned int channel,
-		      unsigned int mode)
-{
-	struct me4000_info *info = dev->private;
-
-	i8254_set_mode(info->timer_regbase, 0, channel,
-			(mode << 1) | I8254_BINARY);
-
-	return 0;
-}
-
 static int me4000_cnt_insn_config(struct comedi_device *dev,
 				  struct comedi_subdevice *s,
-				  struct comedi_insn *insn, unsigned int *data)
+				  struct comedi_insn *insn,
+				  unsigned int *data)
 {
-
+	struct me4000_info *info = dev->private;
 	int err;
 
 	switch (data[0]) {
 	case GPCT_RESET:
-		if (insn->n != 1) {
-			printk(KERN_ERR
-			       "comedi%d: me4000: me4000_cnt_insn_config(): "
-			       "Invalid instruction length%d\n",
-			       dev->minor, insn->n);
+		if (insn->n != 1)
 			return -EINVAL;
-		}
 
-		err = cnt_reset(dev, insn->chanspec);
+		err = i8254_load(info->timer_regbase, 0, insn->chanspec, 0,
+				I8254_MODE0 | I8254_BINARY);
 		if (err)
 			return err;
 		break;
 	case GPCT_SET_OPERATION:
-		if (insn->n != 2) {
-			printk(KERN_ERR
-			       "comedi%d: me4000: me4000_cnt_insn_config(): "
-			       "Invalid instruction length%d\n",
-			       dev->minor, insn->n);
+		if (insn->n != 2)
 			return -EINVAL;
-		}
 
-		err = cnt_config(dev, insn->chanspec, data[1]);
+		err = i8254_set_mode(info->timer_regbase, 0, insn->chanspec,
+				(data[1] << 1) | I8254_BINARY);
 		if (err)
 			return err;
 		break;
 	default:
-		printk(KERN_ERR
-		       "comedi%d: me4000: me4000_cnt_insn_config(): "
-		       "Invalid instruction\n", dev->minor);
 		return -EINVAL;
 	}
 
-	return 2;
+	return insn->n;
 }
 
 static int me4000_cnt_insn_read(struct comedi_device *dev,