[PATCH 080/107] staging: comedi: ni_stc.h: tidy up AO_*_Save_Registers
H Hartley Sweeten
hsweeten at visionengravers.com
Fri May 1 21:59:45 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 | 6 +++---
drivers/staging/comedi/drivers/ni_stc.h | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 9cd796c..b194d15 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -420,9 +420,9 @@ static const struct mio_regmap m_series_stc_read_regmap[] = {
[NISTC_G1_HW_SAVE_REG] = { 0x114, 4 },
[NISTC_G0_SAVE_REG] = { 0x118, 4 },
[NISTC_G1_SAVE_REG] = { 0x11c, 4 },
- [AO_UI_Save_Registers] = { 0x120, 4 },
- [AO_BC_Save_Registers] = { 0x124, 4 },
- [AO_UC_Save_Registers] = { 0x128, 4 },
+ [NISTC_AO_UI_SAVE_REG] = { 0x120, 4 },
+ [NISTC_AO_BC_SAVE_REG] = { 0x124, 4 },
+ [NISTC_AO_UC_SAVE_REG] = { 0x128, 4 },
[Joint_Status_1_Register] = { 0x136, 2 },
[DIO_Serial_Input_Register] = { 0x009, 1 },
[Joint_Status_2_Register] = { 0x13a, 2 },
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index ff57721..af07e4c 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -546,6 +546,10 @@
#define NISTC_G0_SAVE_REG 12
#define NISTC_G1_SAVE_REG 14
+#define NISTC_AO_UI_SAVE_REG 16
+#define NISTC_AO_BC_SAVE_REG 18
+#define NISTC_AO_UC_SAVE_REG 20
+
#define AI_SI_Save_Registers 64
#define AI_SC_Save_Registers 66
@@ -558,10 +562,6 @@ enum Joint_Status_2_Bits {
AO_TMRDACWRs_In_Progress_St = 0x20,
};
-#define AO_UI_Save_Registers 16
-#define AO_BC_Save_Registers 18
-#define AO_UC_Save_Registers 20
-
/* command register */
#define G_Disarm_Copy _bit15 /* strobe */
#define G_Save_Trace_Copy _bit14
--
2.3.0
More information about the devel
mailing list