From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 6 Jun 2013 00:49:00 +0000 (-0700)
Subject: staging: comedi: pcl730: tidy up pcl730_di_insn()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=74f14a58b95cbc561a527ab14953504d0d9dc61d;p=deliverable%2Flinux.git

staging: comedi: pcl730: tidy up pcl730_di_insn()

For aesthetic reasons, rename the function.

Use a local variable for the 'reg' offset that is stored in the
comedi_subdevice 'private' pointer to minimize the number of casts.

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/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
index ab51c9233816..bde2e30857d2 100644
--- a/drivers/staging/comedi/drivers/pcl730.c
+++ b/drivers/staging/comedi/drivers/pcl730.c
@@ -66,11 +66,14 @@ static int pcl730_do_insn_bits(struct comedi_device *dev,
 	return insn->n;
 }
 
-static int pcl730_di_insn(struct comedi_device *dev, struct comedi_subdevice *s,
-			  struct comedi_insn *insn, unsigned int *data)
+static int pcl730_di_insn_bits(struct comedi_device *dev,
+			       struct comedi_subdevice *s,
+			       struct comedi_insn *insn,
+			       unsigned int *data)
 {
-	data[1] = inb(dev->iobase + ((unsigned long)s->private)) |
-	    (inb(dev->iobase + ((unsigned long)s->private) + 1) << 8);
+	unsigned long reg = (unsigned long)s->private;
+
+	data[1] = inb(dev->iobase + reg) | (inb(dev->iobase + reg + 1) << 8);
 
 	return insn->n;
 }
@@ -105,7 +108,7 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	s->subdev_flags = SDF_READABLE;
 	s->maxdata = 1;
 	s->n_chan = 16;
-	s->insn_bits = pcl730_di_insn;
+	s->insn_bits = pcl730_di_insn_bits;
 	s->range_table = &range_digital;
 	s->private = (void *)PCL730_IDIO_LO;
 
@@ -125,7 +128,7 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	s->subdev_flags = SDF_READABLE;
 	s->maxdata = 1;
 	s->n_chan = 16;
-	s->insn_bits = pcl730_di_insn;
+	s->insn_bits = pcl730_di_insn_bits;
 	s->range_table = &range_digital;
 	s->private = (void *)PCL730_DIO_LO;