[PATCH 082/107] staging: comedi: ni_stc.h: tidy up DIO_Serial_Input_Register

H Hartley Sweeten hsweeten at visionengravers.com
Fri May 1 21:59:47 UTC 2015


Rename the CamelCase.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/ni_mio_common.c | 4 ++--
 drivers/staging/comedi/drivers/ni_stc.h        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 9051477..cb4aed1 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -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);
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 2d7f342..509578c 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -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,
-- 
2.3.0



More information about the devel mailing list