From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 11 Nov 2014 23:55:29 +0000 (-0700)
Subject: staging: comedi: dmm32at: rename DMM32AT_CONV
X-Git-Tag: v3.19-rc1~66^2~140
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32b994eaeed6300ad36b94ae089021bfdf84dc7f;p=karo-tx-linux.git

staging: comedi: dmm32at: rename DMM32AT_CONV

For aesthetics, rename this define used for the Start A/D Conversion register.

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/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index df0a47fe0d11..ee6e510fef97 100644
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -41,7 +41,7 @@ Configuration Options:
 #include "comedi_fc.h"
 
 /* Board register addresses */
-#define DMM32AT_CONV 0x00
+#define DMM32AT_AI_START_CONV_REG	0x00
 #define DMM32AT_AILSB 0x00
 #define DMM32AT_AUXDOUT 0x01
 #define DMM32AT_AIMSB 0x01
@@ -200,7 +200,7 @@ static int dmm32at_ai_insn_read(struct comedi_device *dev,
 		return ret;
 
 	for (i = 0; i < insn->n; i++) {
-		outb(0xff, dev->iobase + DMM32AT_CONV);
+		outb(0xff, dev->iobase + DMM32AT_AI_START_CONV_REG);
 
 		ret = comedi_timeout(dev, s, insn, dmm32at_ai_status,
 				     DMM32AT_AISTAT);
@@ -365,7 +365,7 @@ static int dmm32at_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 	} else {
 		/* start the interrups and initiate a single scan */
 		outb(DMM32AT_ADINT, dev->iobase + DMM32AT_INTCLOCK);
-		outb(0xff, dev->iobase + DMM32AT_CONV);
+		outb(0xff, dev->iobase + DMM32AT_AI_START_CONV_REG);
 	}
 
 	return 0;