[PATCH 068/107] staging: comedi: ni_stc.h: tidy up RTSI_Board_Register

H Hartley Sweeten hsweeten at visionengravers.com
Fri May 1 21:59:33 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 | 10 +++++-----
 drivers/staging/comedi/drivers/ni_stc.h        |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index a29ee9e..3334c54 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -374,7 +374,7 @@ static const struct mio_regmap m_series_stc_write_regmap[] = {
 	[NISTC_AO_PERSONAL_REG]		= { 0x19c, 2 },
 	[NISTC_RTSI_TRIGA_OUT_REG]	= { 0x19e, 2 },
 	[NISTC_RTSI_TRIGB_OUT_REG]	= { 0x1a0, 2 },
-	[RTSI_Board_Register]		= { 0, 0 }, /* Unknown */
+	[NISTC_RTSI_BOARD_REG]		= { 0, 0 }, /* Unknown */
 	[Configuration_Memory_Clear]	= { 0x1a4, 2 },
 	[ADC_FIFO_Clear]		= { 0x1a6, 2 },
 	[DAC_FIFO_Clear]		= { 0x1a8, 2 },
@@ -4935,10 +4935,10 @@ static void ni_rtsi_init(struct comedi_device *dev)
 	ni_stc_writew(dev, devpriv->rtsi_trig_b_output_reg,
 		      NISTC_RTSI_TRIGB_OUT_REG);
 
-/*
-* Sets the source and direction of the 4 on board lines
-* ni_stc_writew(dev, 0x0000, RTSI_Board_Register);
-*/
+	/*
+	 * Sets the source and direction of the 4 on board lines
+	 * ni_stc_writew(dev, 0, NISTC_RTSI_BOARD_REG);
+	 */
 }
 
 #ifdef PCIDMA
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 88ffdf0..123cde6 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -455,6 +455,8 @@
 #define NISTC_RTSI_TRIG_MASK(_c)	NISTC_RTSI_TRIG((_c), 0xf)
 #define NISTC_RTSI_TRIG_TO_SRC(_c, _b)	(((_b) >> (((_c) % 4) * 4)) & 0xf)
 
+#define NISTC_RTSI_BOARD_REG		81
+
 #define AI_Status_1_Register		2
 #define Interrupt_A_St				0x8000
 #define AI_FIFO_Full_St				0x4000
@@ -513,7 +515,6 @@ enum Joint_Status_2_Bits {
 #define AO_BC_Save_Registers		18
 #define AO_UC_Save_Registers		20
 
-#define	RTSI_Board_Register		81
 #define Write_Strobe_0_Register		82
 #define Write_Strobe_1_Register		83
 #define Write_Strobe_2_Register		84
-- 
2.3.0



More information about the devel mailing list