forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_stc.h: tidy up DIO_Serial_Input_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:47 -07:00 • committed by Greg Kroah-Hartman
commit 8fbb015484
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/comedi/drivers/ni_mio_common.c
View file

@ -424,7 +424,7 @@ static const struct mio_regmap m_series_stc_read_regmap[] = {
[NISTC_AO_BC_SAVE_REG] = { 0x124, 4 },
[NISTC_AO_UC_SAVE_REG] = { 0x128, 4 },
[NISTC_STATUS1_REG] = { 0x136, 2 },
[DIO_Serial_Input_Register] = { 0x009, 1 },
[NISTC_DIO_SERIAL_IN_REG] = { 0x009, 1 },
[Joint_Status_2_Register] = { 0x13a, 2 },
[AI_SI_Save_Registers] = { 0x180, 4 },
[AI_SC_Save_Registers] = { 0x184, 4 },
@ -3552,7 +3552,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device *dev,
udelay((devpriv->serial_interval_ns + 999) / 1000);
if (data_in)
*data_in = ni_stc_readw(dev, DIO_Serial_Input_Register);
*data_in = ni_stc_readw(dev, NISTC_DIO_SERIAL_IN_REG);
Error:
ni_stc_writew(dev, devpriv->dio_control, NISTC_DIO_CTRL_REG);

3
drivers/staging/comedi/drivers/ni_stc.h
View file

@ -553,10 +553,11 @@
#define NISTC_STATUS1_REG 27
#define NISTC_STATUS1_SERIO_IN_PROG BIT(12)
#define NISTC_DIO_SERIAL_IN_REG 28
#define AI_SI_Save_Registers 64
#define AI_SC_Save_Registers 66
#define DIO_Serial_Input_Register 28
#define Joint_Status_2_Register 29
enum Joint_Status_2_Bits {
AO_TMRDACWRs_In_Progress_St = 0x20,