From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 17 Aug 2015 23:58:16 +0000 (-0700)
Subject: staging: comedi: s526: add defines for the ao/ai data register
X-Git-Tag: firefly_0821_release~176^2~802^2~2294
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=15bccf2e5d7f5d1960c41962b2b628bd1b034ce2;p=firefly-linux-kernel-4.4.55.git

staging: comedi: s526: add defines for the ao/ai data register

The same register is used for analog output and input data. Add defines
for both for added clarity.

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/s526.c b/drivers/staging/comedi/drivers/s526.c
index ff576d32753e..5f8a5d3aa9f7 100644
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -65,7 +65,8 @@
 #define S526_AI_CTRL_CONV(x)	(1 << (5 + ((x) & 0x9)))
 #define S526_AI_CTRL_READ(x)	(((x) & 0xf) << 1)
 #define S526_AI_CTRL_START	BIT(0)
-#define REG_ADD 0x08
+#define S526_AO_REG		0x08
+#define S526_AI_REG		0x08
 #define REG_DIO 0x0A
 #define REG_IER 0x0C
 #define REG_ISR 0x0E
@@ -445,8 +446,7 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 
 		outw(ISR_ADC_DONE, dev->iobase + REG_ISR);
 
-		/* read data */
-		d = inw(dev->iobase + REG_ADD);
+		d = inw(dev->iobase + S526_AI_REG);
 
 		/* munge data */
 		data[n] = d ^ 0x8000;
@@ -471,7 +471,7 @@ static int s526_ao_insn_write(struct comedi_device *dev,
 
 	for (i = 0; i < insn->n; i++) {
 		val = data[i];
-		outw(val, dev->iobase + REG_ADD);
+		outw(val, dev->iobase + S526_AO_REG);
 		outw(ctrl, dev->iobase + S526_AO_CTRL_REG);
 	}
 	s->readback[chan] = val;