From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 8 Apr 2013 21:31:23 +0000 (-0700)
Subject: staging: comedi: acl7225b: cleanup acl7225b_do_insn_bits()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=64592df26f47a5b5512da2e23475bba5d918fbf6;p=deliverable%2Flinux.git

staging: comedi: acl7225b: cleanup acl7225b_do_insn_bits()

Use a local variable to hold the base register, 'reg', that is used
to write to the relays.

Add local variables for the 'mask' and 'bits' values used to update
the relays.

The relays only need to be updated if the 'mask' is set. Move the outb()
calls into the if (mask) to make this clearer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c
index ae7ac950c6de..80cfa817dd45 100644
--- a/drivers/staging/comedi/drivers/acl7225b.c
+++ b/drivers/staging/comedi/drivers/acl7225b.c
@@ -40,15 +40,19 @@ static int acl7225b_do_insn_bits(struct comedi_device *dev,
 				 struct comedi_insn *insn,
 				 unsigned int *data)
 {
-	if (data[0]) {
-		s->state &= ~data[0];
-		s->state |= (data[0] & data[1]);
+	unsigned long reg = (unsigned long)s->private;
+	unsigned int mask = data[0];
+	unsigned int bits = data[1];
+
+	if (mask) {
+		s->state &= ~mask;
+		s->state |= (bits & mask);
+
+		if (mask & 0x00ff)
+			outb(s->state & 0xff, dev->iobase + reg);
+		if (mask & 0xff00)
+			outb((s->state >> 8), dev->iobase + reg + 1);
 	}
-	if (data[0] & 0x00ff)
-		outb(s->state & 0xff, dev->iobase + (unsigned long)s->private);
-	if (data[0] & 0xff00)
-		outb((s->state >> 8),
-		     dev->iobase + (unsigned long)s->private + 1);
 
 	data[1] = s->state;