]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: ni_stc.h: tidy up AI_DIV_Load_A_Register
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 1 May 2015 21:59:20 +0000 (14:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 May 2015 17:05:12 +0000 (19:05 +0200)
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>
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/comedi/drivers/ni_stc.h

index 880c50f8ec92611be88cd8205476f74481257b40..ba1c991408d349fbd85abed680a777b7ecf8e1fd 100644 (file)
@@ -359,7 +359,7 @@ static const struct mio_regmap m_series_stc_write_regmap[] = {
        [NISTC_ATRIG_ETC_REG]           = { 0x17a, 2 },
        [NISTC_AI_START_STOP_REG]       = { 0x17c, 2 },
        [NISTC_AI_TRIG_SEL_REG]         = { 0x17e, 2 },
-       [AI_DIV_Load_A_Register]        = { 0x180, 4 },
+       [NISTC_AI_DIV_LOADA_REG]        = { 0x180, 4 },
        [AO_Start_Select_Register]      = { 0x184, 2 },
        [AO_Trigger_Select_Register]    = { 0x186, 2 },
        [G_Autoincrement_Register(0)]   = { 0x188, 2 },
index 709c8bd5c9f6e68a6edd7635870d4ff1a266c9a3..4b4cc9fd88f47221b225ec6c3fc85c9c6ea5641b 100644 (file)
 #define NISTC_AI_TRIG_START1_EDGE      BIT(5)
 #define NISTC_AI_TRIG_START1_SEL(x)    (((x) & 0x1f) << 0)
 
+#define NISTC_AI_DIV_LOADA_REG         64
+
 #define AI_Status_1_Register           2
 #define Interrupt_A_St                         0x8000
 #define AI_FIFO_Full_St                                0x4000
@@ -394,8 +396,6 @@ enum Joint_Status_2_Bits {
 #define AO_BC_Save_Registers           18
 #define AO_UC_Save_Registers           20
 
-#define AI_DIV_Load_A_Register 64
-
 #define AO_Start_Select_Register       66
 #define AO_UI2_Software_Gate                   _bit15
 #define AO_UI2_External_Gate_Polarity          _bit14