staging: comedi: ni_stc.h: tidy up NI_M_AI_CFG_FIFO_DATA_REG bits

Rename all the CamelCase and convert the enum and helper functions
into defines. Use the BIT() macro to define the bits.

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 93c7b1325f127655ab57d951ea7888c334a9d9c8..0cd5fc24759b08eea1fed1c0d58ec360a298241c 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -1792,29 +1792,26 @@ static void ni_m_series_load_channelgain_list(struct comedi_device *dev,
                devpriv->ai_offset[i] = 0;
                switch (aref) {
                case AREF_DIFF:
-                       config_bits |=
-                           MSeries_AI_Config_Channel_Type_Differential_Bits;
+                       config_bits |= NI_M_AI_CFG_CHAN_TYPE_DIFF;
                        break;
                case AREF_COMMON:
-                       config_bits |=
-                           MSeries_AI_Config_Channel_Type_Common_Ref_Bits;
+                       config_bits |= NI_M_AI_CFG_CHAN_TYPE_COMMON;
                        break;
                case AREF_GROUND:
-                       config_bits |=
-                           MSeries_AI_Config_Channel_Type_Ground_Ref_Bits;
+                       config_bits |= NI_M_AI_CFG_CHAN_TYPE_GROUND;
                        break;
                case AREF_OTHER:
                        break;
                }
-               config_bits |= MSeries_AI_Config_Channel_Bits(chan);
-               config_bits |= MSeries_AI_Config_Bank_Bits(chan);
-               config_bits |= MSeries_AI_Config_Gain_Bits(range_code);
+               config_bits |= NI_M_AI_CFG_CHAN_SEL(chan);
+               config_bits |= NI_M_AI_CFG_BANK_SEL(chan);
+               config_bits |= NI_M_AI_CFG_GAIN(range_code);
                if (i == n_chan - 1)
-                       config_bits |= MSeries_AI_Config_Last_Channel_Bit;
+                       config_bits |= NI_M_AI_CFG_LAST_CHAN;
                if (dither)
-                       config_bits |= MSeries_AI_Config_Dither_Bit;
+                       config_bits |= NI_M_AI_CFG_DITHER;
                /*  don't use 2's complement encoding */
-               config_bits |= MSeries_AI_Config_Polarity_Bit;
+               config_bits |= NI_M_AI_CFG_POLARITY;
                ni_writew(dev, config_bits, NI_M_AI_CFG_FIFO_DATA_REG);
        }
        ni_prime_channelgain_list(dev);

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index c86dadec932e91ccbfa527be4763c602294c6f5a..fb23372d597dbf490bb0b3ece81c1d2e5375c734 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -938,6 +938,20 @@ static const struct comedi_lrange range_ni_E_ao_ext;
 #define NI_M_CAL_PWM_REG               0x040
 #define NI_M_GEN_PWM_REG(x)            (0x044 + ((x) * 2))
 #define NI_M_AI_CFG_FIFO_DATA_REG      0x05e
+#define NI_M_AI_CFG_LAST_CHAN          BIT(14)
+#define NI_M_AI_CFG_DITHER             BIT(13)
+#define NI_M_AI_CFG_POLARITY           BIT(12)
+#define NI_M_AI_CFG_GAIN(x)            (((x) & 0x7) << 9)
+#define NI_M_AI_CFG_CHAN_TYPE(x)       (((x) & 0x7) << 6)
+#define NI_M_AI_CFG_CHAN_TYPE_MASK     NI_M_AI_CFG_CHAN_TYPE(7)
+#define NI_M_AI_CFG_CHAN_TYPE_CALIB    NI_M_AI_CFG_CHAN_TYPE(0)
+#define NI_M_AI_CFG_CHAN_TYPE_DIFF     NI_M_AI_CFG_CHAN_TYPE(1)
+#define NI_M_AI_CFG_CHAN_TYPE_COMMON   NI_M_AI_CFG_CHAN_TYPE(2)
+#define NI_M_AI_CFG_CHAN_TYPE_GROUND   NI_M_AI_CFG_CHAN_TYPE(3)
+#define NI_M_AI_CFG_CHAN_TYPE_AUX      NI_M_AI_CFG_CHAN_TYPE(5)
+#define NI_M_AI_CFG_CHAN_TYPE_GHOST    NI_M_AI_CFG_CHAN_TYPE(7)
+#define NI_M_AI_CFG_BANK_SEL(x)                ((((x) & 0x40) << 4) | ((x) & 0x30))
+#define NI_M_AI_CFG_CHAN_SEL(x)                (((x) & 0xf) << 0)
 #define NI_M_INTC_ENA_REG              0x088
 #define NI_M_INTC_STATUS_REG           0x088
 #define NI_M_ATRIG_CTRL_REG            0x08c
@@ -972,33 +986,6 @@ static const struct comedi_lrange range_ni_E_ao_ext;
 #define NI_M_STATIC_AI_CTRL_REG(x)     ((x) ? (0x260 + (x)) : 0x064)
 #define NI_M_AO_REF_ATTENUATION_REG(x) (0x264 + (x))
 
-enum MSeries_AI_Config_FIFO_Data_Bits {
-       MSeries_AI_Config_Channel_Type_Mask = 0x7 << 6,
-       MSeries_AI_Config_Channel_Type_Calibration_Bits = 0x0,
-       MSeries_AI_Config_Channel_Type_Differential_Bits = 0x1 << 6,
-       MSeries_AI_Config_Channel_Type_Common_Ref_Bits = 0x2 << 6,
-       MSeries_AI_Config_Channel_Type_Ground_Ref_Bits = 0x3 << 6,
-       MSeries_AI_Config_Channel_Type_Aux_Bits = 0x5 << 6,
-       MSeries_AI_Config_Channel_Type_Ghost_Bits = 0x7 << 6,
-       MSeries_AI_Config_Polarity_Bit = 0x1000,        /*  0 for 2's complement encoding */
-       MSeries_AI_Config_Dither_Bit = 0x2000,
-       MSeries_AI_Config_Last_Channel_Bit = 0x4000,
-};
-static inline unsigned MSeries_AI_Config_Channel_Bits(unsigned channel)
-{
-       return channel & 0xf;
-}
-
-static inline unsigned MSeries_AI_Config_Bank_Bits(unsigned channel)
-{
-       return ((channel & 0x40) << 4) | (channel & 0x30);
-}
-
-static inline unsigned MSeries_AI_Config_Gain_Bits(unsigned range)
-{
-       return (range & 0x7) << 9;
-}
-
 enum MSeries_Clock_and_Fout2_Bits {
        MSeries_PLL_In_Source_Select_RTSI0_Bits = 0xb,
        MSeries_PLL_In_Source_Select_Star_Trigger_Bits = 0x14,