From: H Hartley Sweeten Date: Tue, 11 Nov 2014 23:55:30 +0000 (-0700) Subject: staging: comedi: dmm32at: rename DMM32AT_AI[LM]SB X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3f4beddff34832fa38c574c55d1fc60c286cb894;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- 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);