staging: comedi: ni_stc.h: tidy up AO_*_Load_[AB]_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 ddc7e7612ce5885b5fbe09f9727dbce7a5b35a49..3035f16c9de5693a7c7911aef28728a6baa11658 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -346,12 +346,12 @@ static const struct mio_regmap m_series_stc_write_regmap[] = {
        [NISTC_G1_INPUT_SEL_REG]        = { 0x14a, 2 },
        [NISTC_AO_MODE1_REG]            = { 0x14c, 2 },
        [NISTC_AO_MODE2_REG]            = { 0x14e, 2 },
-       [AO_UI_Load_A_Register]         = { 0x150, 4 },
-       [AO_UI_Load_B_Register]         = { 0x154, 4 },
-       [AO_BC_Load_A_Register]         = { 0x158, 4 },
-       [AO_BC_Load_B_Register]         = { 0x15c, 4 },
-       [AO_UC_Load_A_Register]         = { 0x160, 4 },
-       [AO_UC_Load_B_Register]         = { 0x164, 4 },
+       [NISTC_AO_UI_LOADA_REG]         = { 0x150, 4 },
+       [NISTC_AO_UI_LOADB_REG]         = { 0x154, 4 },
+       [NISTC_AO_BC_LOADA_REG]         = { 0x158, 4 },
+       [NISTC_AO_BC_LOADB_REG]         = { 0x15c, 4 },
+       [NISTC_AO_UC_LOADA_REG]         = { 0x160, 4 },
+       [NISTC_AO_UC_LOADB_REG]         = { 0x164, 4 },
        [Clock_and_FOUT_Register]       = { 0x170, 2 },
        [IO_Bidirection_Pin_Register]   = { 0x172, 2 },
        [RTSI_Trig_Direction_Register]  = { 0x174, 2 },
@@ -2994,9 +2994,9 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        devpriv->ao_mode2 &= ~NISTC_AO_MODE2_BC_INIT_LOAD_SRC;
        ni_stc_writew(dev, devpriv->ao_mode2, NISTC_AO_MODE2_REG);
        if (cmd->stop_src == TRIG_NONE)
-               ni_stc_writel(dev, 0xffffff, AO_BC_Load_A_Register);
+               ni_stc_writel(dev, 0xffffff, NISTC_AO_BC_LOADA_REG);
        else
-               ni_stc_writel(dev, 0, AO_BC_Load_A_Register);
+               ni_stc_writel(dev, 0, NISTC_AO_BC_LOADA_REG);
        ni_stc_writew(dev, NISTC_AO_CMD1_BC_LOAD, NISTC_AO_CMD1_REG);
        devpriv->ao_mode2 &= ~NISTC_AO_MODE2_UC_INIT_LOAD_SRC;
        ni_stc_writew(dev, devpriv->ao_mode2, NISTC_AO_MODE2_REG);
@@ -3005,27 +3005,27 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                if (devpriv->is_m_series) {
                        /*  this is how the NI example code does it for m-series boards, verified correct with 6259 */
                        ni_stc_writel(dev, cmd->stop_arg - 1,
-                                     AO_UC_Load_A_Register);
+                                     NISTC_AO_UC_LOADA_REG);
                        ni_stc_writew(dev, NISTC_AO_CMD1_UC_LOAD,
                                      NISTC_AO_CMD1_REG);
                } else {
                        ni_stc_writel(dev, cmd->stop_arg,
-                                     AO_UC_Load_A_Register);
+                                     NISTC_AO_UC_LOADA_REG);
                        ni_stc_writew(dev, NISTC_AO_CMD1_UC_LOAD,
                                      NISTC_AO_CMD1_REG);
                        ni_stc_writel(dev, cmd->stop_arg - 1,
-                                     AO_UC_Load_A_Register);
+                                     NISTC_AO_UC_LOADA_REG);
                }
                break;
        case TRIG_NONE:
-               ni_stc_writel(dev, 0xffffff, AO_UC_Load_A_Register);
+               ni_stc_writel(dev, 0xffffff, NISTC_AO_UC_LOADA_REG);
                ni_stc_writew(dev, NISTC_AO_CMD1_UC_LOAD, NISTC_AO_CMD1_REG);
-               ni_stc_writel(dev, 0xffffff, AO_UC_Load_A_Register);
+               ni_stc_writel(dev, 0xffffff, NISTC_AO_UC_LOADA_REG);
                break;
        default:
-               ni_stc_writel(dev, 0, AO_UC_Load_A_Register);
+               ni_stc_writel(dev, 0, NISTC_AO_UC_LOADA_REG);
                ni_stc_writew(dev, NISTC_AO_CMD1_UC_LOAD, NISTC_AO_CMD1_REG);
-               ni_stc_writel(dev, cmd->stop_arg, AO_UC_Load_A_Register);
+               ni_stc_writel(dev, cmd->stop_arg, NISTC_AO_UC_LOADA_REG);
        }
 
        devpriv->ao_mode1 &= ~(NISTC_AO_MODE1_UPDATE_SRC_MASK |
@@ -3038,9 +3038,9 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                trigvar =
                    ni_ns_to_timer(dev, cmd->scan_begin_arg,
                                   CMDF_ROUND_NEAREST);
-               ni_stc_writel(dev, 1, AO_UI_Load_A_Register);
+               ni_stc_writel(dev, 1, NISTC_AO_UI_LOADA_REG);
                ni_stc_writew(dev, NISTC_AO_CMD1_UI_LOAD, NISTC_AO_CMD1_REG);
-               ni_stc_writel(dev, trigvar, AO_UI_Load_A_Register);
+               ni_stc_writel(dev, trigvar, NISTC_AO_UI_LOADA_REG);
                break;
        case TRIG_EXT:
                devpriv->ao_mode1 |=

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 4100bad9e1e56776a2786207d78a3a426ba2ea26..6a19016f7a294a65c87d720004dc58c8a0118ef3 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -252,6 +252,13 @@
 #define NISTC_AO_MODE2_BC_RELOAD_MODE  BIT(1)
 #define NISTC_AO_MODE2_BC_WR_SWITCH    BIT(0)
 
+#define NISTC_AO_UI_LOADA_REG          40
+#define NISTC_AO_UI_LOADB_REG          42
+#define NISTC_AO_BC_LOADA_REG          44
+#define NISTC_AO_BC_LOADB_REG          46
+#define NISTC_AO_UC_LOADA_REG          48
+#define NISTC_AO_UC_LOADB_REG          50
+
 #define AI_Status_1_Register           2
 #define Interrupt_A_St                         0x8000
 #define AI_FIFO_Full_St                                0x4000
@@ -306,22 +313,8 @@ enum Joint_Status_2_Bits {
        AO_TMRDACWRs_In_Progress_St = 0x20,
 };
 
-#define AO_UI_Load_A_Register          40
-#define AO_UI_Load_A_Register_High     40
-#define AO_UI_Load_A_Register_Low      41
-#define AO_UI_Load_B_Register          42
 #define AO_UI_Save_Registers           16
-#define AO_BC_Load_A_Register          44
-#define AO_BC_Load_A_Register_High     44
-#define AO_BC_Load_A_Register_Low      45
-#define AO_BC_Load_B_Register          46
-#define AO_BC_Load_B_Register_High     46
-#define AO_BC_Load_B_Register_Low      47
 #define AO_BC_Save_Registers           18
-#define AO_UC_Load_A_Register          48
-#define AO_UC_Load_A_Register_High     48
-#define AO_UC_Load_A_Register_Low      49
-#define AO_UC_Load_B_Register          50
 #define AO_UC_Save_Registers           20
 
 #define Clock_and_FOUT_Register                56