staging: comedi: ni_stc.h: tidy up G_Save_Register

Rename the CamelCase and define the G0 and G1 registers to add clarity
to the mio_regmap tables.

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>

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index f0f449c5dce59b05843e5b41b4506651d680344e..9cd796ce18325b89adb743599aad86c2e488d706 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -418,8 +418,8 @@ static const struct mio_regmap m_series_stc_read_regmap[] = {
        [NISTC_DIO_IN_REG]              = { 0, 0 }, /* Unknown */
        [NISTC_G0_HW_SAVE_REG]          = { 0x110, 4 },
        [NISTC_G1_HW_SAVE_REG]          = { 0x114, 4 },
-       [G_Save_Register(0)]            = { 0x118, 4 },
-       [G_Save_Register(1)]            = { 0x11c, 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 },
@@ -3708,8 +3708,8 @@ static const struct mio_regmap ni_gpct_to_stc_regmap[] = {
        [NITIO_G1_CMD]          = { NISTC_G1_CMD_REG, 2 },
        [NITIO_G0_HW_SAVE]      = { NISTC_G0_HW_SAVE_REG, 4 },
        [NITIO_G1_HW_SAVE]      = { NISTC_G1_HW_SAVE_REG, 4 },
-       [NITIO_G0_SW_SAVE]      = { G_Save_Register(0), 4 },
-       [NITIO_G1_SW_SAVE]      = { G_Save_Register(1), 4 },
+       [NITIO_G0_SW_SAVE]      = { NISTC_G0_SAVE_REG, 4 },
+       [NITIO_G1_SW_SAVE]      = { NISTC_G1_SAVE_REG, 4 },
        [NITIO_G0_MODE]         = { NISTC_G0_MODE_REG, 2 },
        [NITIO_G1_MODE]         = { NISTC_G1_MODE_REG, 2 },
        [NITIO_G0_LOADA]        = { NISTC_G0_LOADA_REG, 4 },

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 0b4dcc475012f0f4f35882879f23ba2799ebc8c5..ff577210c23c57a8f325f7c492e54a2178b22385 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -543,6 +543,9 @@
 #define NISTC_G0_HW_SAVE_REG           8
 #define NISTC_G1_HW_SAVE_REG           10
 
+#define NISTC_G0_SAVE_REG              12
+#define NISTC_G1_SAVE_REG              14
+
 #define AI_SI_Save_Registers           64
 #define AI_SC_Save_Registers           66
 
@@ -559,10 +562,6 @@ enum Joint_Status_2_Bits {
 #define AO_BC_Save_Registers           18
 #define AO_UC_Save_Registers           20
 
-#define G_Save_Register(a)             (12+(a)*2)
-#define G_Save_Register_High(a)                (12+(a)*2)
-#define G_Save_Register_Low(a)         (13+(a)*2)
-
 /* command register */
 #define G_Disarm_Copy                  _bit15  /* strobe */
 #define G_Save_Trace_Copy              _bit14