diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-05-01 14:59:56 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-09 19:05:17 +0200 |
| commit | 363f570ef0e4a5361e97a1c0632e17c5d4148ec8 (patch) | |
| tree | c69bc6c6194ad117cd3bea1d4a606dc3683785ec | |
| parent | staging: comedi: ni_stc.h: tidy up 8255 register defines (diff) | |
staging: comedi: ni_stc.h: tidy up ADC_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>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 6 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 202957c0c3a7..74817f8a2728 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -1154,7 +1154,7 @@ static void ni_ai_fifo_read(struct comedi_device *dev, } for (i = 0; i < n; i++) { devpriv->ai_fifo_buffer[i] = - ni_readw(dev, ADC_FIFO_Data_Register); + ni_readw(dev, NI_E_AI_FIFO_DATA_REG); } comedi_buf_write_samples(s, devpriv->ai_fifo_buffer, n); } @@ -1230,7 +1230,7 @@ static void ni_handle_fifo_dregs(struct comedi_device *dev) if (fifo_empty) break; devpriv->ai_fifo_buffer[i] = - ni_readw(dev, ADC_FIFO_Data_Register); + ni_readw(dev, NI_E_AI_FIFO_DATA_REG); } comedi_buf_write_samples(s, devpriv->ai_fifo_buffer, i); } @@ -2006,7 +2006,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, dl &= mask; data[n] = dl; } else { - d = ni_readw(dev, ADC_FIFO_Data_Register); + d = ni_readw(dev, NI_E_AI_FIFO_DATA_REG); d += signbits; /* subtle: needs to be short addition */ data[n] = d; } diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 3bf73a7a9921..ea5999c8a907 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -637,7 +637,7 @@ static inline unsigned int AI_CONFIG_CHANNEL(unsigned int channel) #define NI_E_8255_BASE 0x19 /* rw8 */ -#define ADC_FIFO_Data_Register 0x1c +#define NI_E_AI_FIFO_DATA_REG 0x1c /* r16 */ #define AO_Configuration 0x16 #define AO_Bipolar _bit0 |