From: H Hartley Sweeten Date: Tue, 11 Nov 2014 23:55:35 +0000 (-0700) Subject: staging: comedi: dmm32at: rename DMM32AT_DACMSB_CHAN X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e46f7651d0e34ac4fbc208bb70c7d6d6166742f3;p=linux-beck.git staging: comedi: dmm32at: rename DMM32AT_DACMSB_CHAN For aesthetics, rename this define used to set the DACH[10] bits in the DAC MSB register to select the D/A channel. 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 2bfa21bb03e7..8585069bc8fe 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c @@ -59,7 +59,7 @@ Configuration Options: #define DMM32AT_AUX_DI0 (1 << 0) /* J3.48 - CLK0 (SRC0) */ #define DMM32AT_AO_LSB_REG 0x04 #define DMM32AT_AO_MSB_REG 0x05 -#define DMM32AT_DACMSB_CHAN(x) ((x) << 6) +#define DMM32AT_AO_MSB_DACH(x) ((x) << 6) #define DMM32AT_FIFOCNTRL 0x07 #define DMM32AT_FIFOSTAT 0x07 @@ -447,7 +447,7 @@ static int dmm32at_ao_insn_write(struct comedi_device *dev, /* write LSB then MSB + chan to load DAC */ outb(val & 0xff, dev->iobase + DMM32AT_AO_LSB_REG); - outb((val >> 8) | DMM32AT_DACMSB_CHAN(chan), + outb((val >> 8) | DMM32AT_AO_MSB_DACH(chan), dev->iobase + DMM32AT_AO_MSB_REG); /* wait for circuit to settle */