diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-05-01 15:00:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-09 19:05:17 +0200 |
| commit | 9e0ad6f4d1fe3ff97ca66bde6484c320ce9d80da (patch) | |
| tree | 8311e8208c1370379f264e09d4b3254e7323e2c4 /drivers | |
| parent | b497b8da801088f380a98851a5c50ffcd7b40c86 (diff) | |
staging: comedi: ni_stc.h: tidy up DAC_FIFO_Data register
Rename the CamelCase.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 39e680e12882..b9e35ead643c 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -1032,7 +1032,7 @@ static void ni_ao_fifo_load(struct comedi_device *dev, } ni_writel(dev, packed_data, DAC_FIFO_Data_611x); } else { - ni_writew(dev, d, DAC_FIFO_Data); + ni_writew(dev, d, NI_E_AO_FIFO_DATA_REG); } } } diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 486e6a08b8dc..2afa701eb4d0 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -642,7 +642,7 @@ static inline unsigned GPCT_DMA_Select_Mask(unsigned gpct_index) #define NI_E_AI_FIFO_DATA_REG 0x1c /* r16 */ -#define DAC_FIFO_Data 0x1e +#define NI_E_AO_FIFO_DATA_REG 0x1e /* w16 */ #define DAC0_Direct_Data 0x18 #define DAC1_Direct_Data 0x1a |