From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 4 May 2016 19:47:11 +0000 (-0700)
Subject: staging: comedi: dt2811: tidy up A/D Data register defines
X-Git-Tag: v4.8-rc1~193^2~184
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d82985fa4c2e2cc6f10f45a4e62a92ab2bce4cd0;p=karo-tx-linux.git

staging: comedi: dt2811: tidy up A/D Data register defines

Cleanup the defines for these registers and and remove the redundant
information in the comment.

Tidy up the reading of the data registers in the (*insn_read).

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

diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index f72d6c8001ed..0c0b7b7d0b12 100644
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -67,6 +67,9 @@
 #define DT2811_ADGCR_GAIN(x)		(((x) & 0x3) << 6)
 #define DT2811_ADGCR_CHAN(x)		(((x) & 0xf) << 0)
 
+#define DT2811_ADDATA_LO_REG		0x02	/* r   A/D Data low byte */
+#define DT2811_ADDATA_HI_REG		0x03	/* r   A/D Data high byte */
+
 static const struct comedi_lrange range_dt2811_pgh_ai_5_unipolar = {
 	4, {
 		UNI_RANGE(5),
@@ -123,7 +126,7 @@ static const struct comedi_lrange range_dt2811_pgl_ai_5_bipolar = {
 
 /*
 
-   0x02,0x03 (R) ADDAT A/D Data Register
+   0x02,0x03
    (W) DADAT0 D/A Data Register 0
    0x02 low byte
    0x03 high byte
@@ -160,8 +163,6 @@ static const struct comedi_lrange range_dt2811_pgl_ai_5_bipolar = {
 
 #define TIMEOUT 10000
 
-#define DT2811_ADDATLO 2
-#define DT2811_ADDATHI 3
 #define DT2811_DADAT0LO 2
 #define DT2811_DADAT0HI 3
 #define DT2811_DADAT1LO 4
@@ -218,6 +219,8 @@ static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
 	int i;
 
 	for (i = 0; i < insn->n; i++) {
+		unsigned int val;
+
 		/* select channel/gain and trigger conversion */
 		outb(DT2811_ADGCR_CHAN(chan) | DT2811_ADGCR_GAIN(range),
 		     dev->iobase + DT2811_ADGCR_REG);
@@ -226,9 +229,11 @@ static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
 		if (ret)
 			return ret;
 
-		data[i] = inb(dev->iobase + DT2811_ADDATLO);
-		data[i] |= inb(dev->iobase + DT2811_ADDATHI) << 8;
-		data[i] &= 0xfff;
+		val = inb(dev->iobase + DT2811_ADDATA_LO_REG) |
+		      (inb(dev->iobase + DT2811_ADDATA_HI_REG) << 8);
+		val &= s->maxdata;
+
+		data[i] = val;
 	}
 
 	return i;