staging: comedi: ni_stc.h: tidy up G_Status_Register

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>

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index d7a723256e1ad7d49542e176517166850483cd09..a71a697f2b9bff96b5166ca1e0ced2caca7974ba 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -412,7 +412,7 @@ static void m_series_stc_write(struct comedi_device *dev,
 static const struct mio_regmap m_series_stc_read_regmap[] = {
        [NISTC_AI_STATUS1_REG]          = { 0x104, 2 },
        [NISTC_AO_STATUS1_REG]          = { 0x106, 2 },
-       [G_Status_Register]             = { 0x108, 2 },
+       [NISTC_G01_STATUS_REG]          = { 0x108, 2 },
        [AI_Status_2_Register]          = { 0, 0 }, /* Unknown */
        [AO_Status_2_Register]          = { 0x10c, 2 },
        [DIO_Parallel_Input_Register]   = { 0, 0 }, /* Unknown */
@@ -3723,7 +3723,7 @@ static const struct mio_regmap ni_gpct_to_stc_regmap[] = {
        [NITIO_G1_CNT_MODE]     = { 0x1b2, 2 }, /* M-Series only */
        [NITIO_G0_GATE2]        = { 0x1b4, 2 }, /* M-Series only */
        [NITIO_G1_GATE2]        = { 0x1b6, 2 }, /* M-Series only */
-       [NITIO_G01_STATUS]      = { G_Status_Register, 2 },
+       [NITIO_G01_STATUS]      = { NISTC_G01_STATUS_REG, 2 },
        [NITIO_G01_RESET]       = { NISTC_RESET_REG, 2 },
        [NITIO_G01_STATUS1]     = { Joint_Status_1_Register, 2 },
        [NITIO_G01_STATUS2]     = { Joint_Status_2_Register, 2 },

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index e1f4b66144bac12662699839b7edda44fc026ed6..5950bab41c77dcd8083f36d0bcac23d48e0ad13b 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -532,6 +532,8 @@
 #define NISTC_AO_STATUS1_FIFO_REQ      BIT(1)
 #define NISTC_AO_STATUS1_PASSTHRU1     BIT(0)
 
+#define NISTC_G01_STATUS_REG           4
+
 #define AI_Status_2_Register           5
 
 #define AO_Status_2_Register           6
@@ -560,7 +562,6 @@ enum Joint_Status_2_Bits {
 #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)
-#define G_Status_Register              4
 
 /* command register */
 #define G_Disarm_Copy                  _bit15  /* strobe */