From d567afb4d8390b173ffe2d76bae3be0885decd04 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 10 Sep 2012 18:51:30 -0700
Subject: [PATCH] --- yaml --- r: 325111 b: refs/heads/master c:
 d3ceb27c70efbe7d1f4e086370e5e0ba76fef5d8 h: refs/heads/master i:   325109:
 5e8f201d1f89b37355c42c0f743ae49c9d990225   325107:
 a2c3631608a0364b47ab8bf9e93810125ef3c0b5   325103:
 e39ce7f89f2680a1ab45d7faf9e2008acd7ca8af v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/adl_pci9111.c      | 65 +++++++------------
 2 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/[refs] b/[refs]
index 1b745ab9801b..9fa36e23fc59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 886edb0caf2be7bbff443a4e272416b7d97d4c9f
+refs/heads/master: d3ceb27c70efbe7d1f4e086370e5e0ba76fef5d8
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
index 54a5e425ee4d..a8d95841da44 100644
--- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -259,33 +259,6 @@ a multiple of chanlist_len*convert_arg.
 #define pci9111_do_set_bits(bits) \
 	outw(bits, dev->iobase + PCI9111_REGISTER_DIGITAL_IO)
 
-#define pci9111_8254_control_set(flags) \
-	outb(flags, dev->iobase + PCI9111_REGISTER_8254_CONTROL)
-
-#define pci9111_8254_counter_0_set(data) \
-	do { \
-		outb(data & 0xFF, \
-			dev->iobase + PCI9111_REGISTER_8254_COUNTER_0); \
-		outb((data >> 8) & 0xFF, \
-			dev->iobase + PCI9111_REGISTER_8254_COUNTER_0); \
-	} while (0)
-
-#define pci9111_8254_counter_1_set(data) \
-	do { \
-		outb(data & 0xFF, \
-			dev->iobase + PCI9111_REGISTER_8254_COUNTER_1); \
-		outb((data >> 8) & 0xFF, \
-			dev->iobase + PCI9111_REGISTER_8254_COUNTER_1); \
-	} while (0)
-
-#define pci9111_8254_counter_2_set(data) \
-	do { \
-		outb(data & 0xFF, \
-			dev->iobase + PCI9111_REGISTER_8254_COUNTER_2); \
-		outb((data >> 8) & 0xFF, \
-			dev->iobase + PCI9111_REGISTER_8254_COUNTER_2); \
-	} while (0)
-
 static const struct comedi_lrange pci9111_hr_ai_range = {
 	5,
 	{
@@ -407,25 +380,35 @@ static void pci9111_timer_set(struct comedi_device *dev)
 {
 	struct pci9111_private_data *dev_private = dev->private;
 
-	pci9111_8254_control_set(PCI9111_8254_COUNTER_0 |
-				 PCI9111_8254_READ_LOAD_LSB_MSB |
-				 PCI9111_8254_MODE_0 |
-				 PCI9111_8254_BINARY_COUNTER);
+	outb(PCI9111_8254_COUNTER_0 |
+	     PCI9111_8254_READ_LOAD_LSB_MSB |
+	     PCI9111_8254_MODE_0 |
+	     PCI9111_8254_BINARY_COUNTER,
+	     dev->iobase + PCI9111_REGISTER_8254_CONTROL);
 
-	pci9111_8254_control_set(PCI9111_8254_COUNTER_1 |
-				 PCI9111_8254_READ_LOAD_LSB_MSB |
-				 PCI9111_8254_MODE_2 |
-				 PCI9111_8254_BINARY_COUNTER);
+	outb(PCI9111_8254_COUNTER_1 |
+	     PCI9111_8254_READ_LOAD_LSB_MSB |
+	     PCI9111_8254_MODE_2 |
+	     PCI9111_8254_BINARY_COUNTER,
+	     dev->iobase + PCI9111_REGISTER_8254_CONTROL);
 
-	pci9111_8254_control_set(PCI9111_8254_COUNTER_2 |
-				 PCI9111_8254_READ_LOAD_LSB_MSB |
-				 PCI9111_8254_MODE_2 |
-				 PCI9111_8254_BINARY_COUNTER);
+	outb(PCI9111_8254_COUNTER_2 |
+	     PCI9111_8254_READ_LOAD_LSB_MSB |
+	     PCI9111_8254_MODE_2 |
+	     PCI9111_8254_BINARY_COUNTER,
+	     dev->iobase + PCI9111_REGISTER_8254_CONTROL);
 
 	udelay(1);
 
-	pci9111_8254_counter_2_set(dev_private->timer_divisor_2);
-	pci9111_8254_counter_1_set(dev_private->timer_divisor_1);
+	outb(dev_private->timer_divisor_2 & 0xff,
+		dev->iobase + PCI9111_REGISTER_8254_COUNTER_2);
+	outb((dev_private->timer_divisor_2 >> 8) & 0xff,
+		dev->iobase + PCI9111_REGISTER_8254_COUNTER_2);
+
+	outb(dev_private->timer_divisor_1 & 0xff,
+		dev->iobase + PCI9111_REGISTER_8254_COUNTER_1);
+	outb((dev_private->timer_divisor_1 >> 8) & 0xff,
+		dev->iobase + PCI9111_REGISTER_8254_COUNTER_1);
 }
 
 enum pci9111_trigger_sources {