aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <[email protected]>2014-11-11 16:55:30 -0700
committerGreg Kroah-Hartman <[email protected]>2014-11-26 15:33:24 -0800
commit3f4beddff34832fa38c574c55d1fc60c286cb894 (patch)
tree0a90df10da0130cd54c2f663522954e966e5249d
parent32b994eaeed6300ad36b94ae089021bfdf84dc7f (diff)
staging: comedi: dmm32at: rename DMM32AT_AI[LM]SB
For aesthetics, rename these defines used for the A/D LSB/MSB registers. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/comedi/drivers/dmm32at.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index ee6e510fef97..e3981115c7b7 100644
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -42,9 +42,9 @@ Configuration Options:
/* Board register addresses */
#define DMM32AT_AI_START_CONV_REG 0x00
-#define DMM32AT_AILSB 0x00
+#define DMM32AT_AI_LSB_REG 0x00
#define DMM32AT_AUXDOUT 0x01
-#define DMM32AT_AIMSB 0x01
+#define DMM32AT_AI_MSB_REG 0x01
#define DMM32AT_AILOW 0x02
#define DMM32AT_AIHIGH 0x03
@@ -164,8 +164,8 @@ static unsigned int dmm32at_ai_get_sample(struct comedi_device *dev,
{
unsigned int val;
- val = inb(dev->iobase + DMM32AT_AILSB);
- val |= (inb(dev->iobase + DMM32AT_AIMSB) << 8);
+ val = inb(dev->iobase + DMM32AT_AI_LSB_REG);
+ val |= (inb(dev->iobase + DMM32AT_AI_MSB_REG) << 8);
/* munge two's complement value to offset binary */
return comedi_offset_munge(s, val);