mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 06:41:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: ni_stc.h: tidy up ADC_FIFO_Data_Register

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten
2015-05-01 14:59:56 -07:00
committed by Greg Kroah-Hartman
parent 61260f5849
commit 363f570ef0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@@ -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;
}

2
drivers/staging/comedi/drivers/ni_stc.h
View File

@@ -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