staging: comedi: ni_stc.h: tidy up IO_Bidirection_Pin_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 41eae5c99feebed6d39503eb92328fc7a8e8363c..fb1df9fc9d388e8aeabb2e834217c7b1ab20eb81 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -353,7 +353,7 @@ static const struct mio_regmap m_series_stc_write_regmap[] = {
        [NISTC_AO_UC_LOADA_REG]         = { 0x160, 4 },
        [NISTC_AO_UC_LOADB_REG]         = { 0x164, 4 },
        [NISTC_CLK_FOUT_REG]            = { 0x170, 2 },
-       [IO_Bidirection_Pin_Register]   = { 0x172, 2 },
+       [NISTC_IO_BIDIR_PIN_REG]        = { 0x172, 2 },
        [RTSI_Trig_Direction_Register]  = { 0x174, 2 },
        [Interrupt_Control_Register]    = { 0x176, 2 },
        [AI_Output_Control_Register]    = { 0x178, 2 },
@@ -542,7 +542,7 @@ static inline void ni_set_bitfield(struct comedi_device *dev, int reg,
                devpriv->int_b_enable_reg |= bit_values & bit_mask;
                ni_stc_writew(dev, devpriv->int_b_enable_reg, reg);
                break;
-       case IO_Bidirection_Pin_Register:
+       case NISTC_IO_BIDIR_PIN_REG:
                devpriv->io_bidirection_pin_reg &= ~bit_mask;
                devpriv->io_bidirection_pin_reg |= bit_values & bit_mask;
                ni_stc_writew(dev, devpriv->io_bidirection_pin_reg, reg);
@@ -4434,10 +4434,10 @@ static int ni_pfi_insn_config(struct comedi_device *dev,
 
        switch (data[0]) {
        case COMEDI_OUTPUT:
-               ni_set_bits(dev, IO_Bidirection_Pin_Register, 1 << chan, 1);
+               ni_set_bits(dev, NISTC_IO_BIDIR_PIN_REG, 1 << chan, 1);
                break;
        case COMEDI_INPUT:
-               ni_set_bits(dev, IO_Bidirection_Pin_Register, 1 << chan, 0);
+               ni_set_bits(dev, NISTC_IO_BIDIR_PIN_REG, 1 << chan, 0);
                break;
        case INSN_CONFIG_DIO_QUERY:
                data[1] =
@@ -5303,7 +5303,7 @@ static int ni_E_init(struct comedi_device *dev,
        }
        s->insn_config  = ni_pfi_insn_config;
 
-       ni_set_bits(dev, IO_Bidirection_Pin_Register, ~0, 0);
+       ni_set_bits(dev, NISTC_IO_BIDIR_PIN_REG, ~0, 0);
 
        /* cs5529 calibration adc */
        s = &dev->subdevices[NI_CS5529_CALIBRATION_SUBDEV];

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 907bf2a196d3b74ff7a4f0efba276d762116c8d9..e6be68cf47a0923ed1898b48ea891da316b3b50b 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -276,6 +276,8 @@
 #define NISTC_CLK_FOUT_TO_DIVIDER(x)   (((x) >> 0) & 0xf)
 #define NISTC_CLK_FOUT_DIVIDER_MASK    NISTC_CLK_FOUT_DIVIDER(0xf)
 
+#define NISTC_IO_BIDIR_PIN_REG         57
+
 #define AI_Status_1_Register           2
 #define Interrupt_A_St                         0x8000
 #define AI_FIFO_Full_St                                0x4000
@@ -334,7 +336,6 @@ enum Joint_Status_2_Bits {
 #define AO_BC_Save_Registers           18
 #define AO_UC_Save_Registers           20
 
-#define IO_Bidirection_Pin_Register    57
 #define        RTSI_Trig_Direction_Register    58
 enum RTSI_Trig_Direction_Bits {
        Drive_RTSI_Clock_Bit = 0x1,