From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 6 Oct 2015 18:11:14 +0000 (-0700)
Subject: staging: comedi: mf6x4: rename remaining BAR1 register defines
X-Git-Tag: v4.14-rc1~4420^2~865
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19e02434714c05da730be08927402d6bc8d51fea;p=platform%2Fkernel%2Flinux-rpi.git

staging: comedi: mf6x4: rename remaining BAR1 register defines

For consistency, rename the ADSTART and DAC register defines to add
a bit of clarity.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
 drivers/staging/comedi/drivers/mf6x4.c | 16 ++++++++--------
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/mf6x4.c b/drivers/staging/comedi/drivers/mf6x4.c
index 30dbdf0..19e2b1e 100644
--- a/drivers/staging/comedi/drivers/mf6x4.c
+++ b/drivers/staging/comedi/drivers/mf6x4.c
@@ -44,8 +44,8 @@
 #define MF6X4_DIN_REG		0x10
 #define MF6X4_DIN_MASK		0xff
 #define MF6X4_DOUT_REG		0x10
-#define MF6X4_ADSTART_R		0x20
-#define MF6X4_DAC_R(x)		(0x20 + ((x) * 2))
+#define MF6X4_ADSTART_REG	0x20
+#define MF6X4_DAC_REG(x)	(0x20 + ((x) * 2))
 
 /* BAR2 registers */
 #define MF634_GPIOC_R		0x68
@@ -142,7 +142,7 @@ static int mf6x4_ai_insn_read(struct comedi_device *dev,
 
 	for (i = 0; i < insn->n; i++) {
 		/* Trigger ADC conversion by reading ADSTART */
-		ioread16(dev->mmio + MF6X4_ADSTART_R);
+		ioread16(dev->mmio + MF6X4_ADSTART_REG);
 
 		ret = comedi_timeout(dev, s, insn, mf6x4_ai_eoc, 0);
 		if (ret)
@@ -178,7 +178,7 @@ static int mf6x4_ao_insn_write(struct comedi_device *dev,
 
 	for (i = 0; i < insn->n; i++) {
 		val = data[i];
-		iowrite16(val, dev->mmio + MF6X4_DAC_R(chan));
+		iowrite16(val, dev->mmio + MF6X4_DAC_REG(chan));
 	}
 	s->readback[chan] = val;