staging: comedi: ni_stc.h: tidy up Configuration_Memory_High register and bits

Rename the CamelCase. 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 0fba36dabd5b28201b21535ac817316bb12020e7..64c44a1a1065ef2aa27e7f5f9ce962f07706bcca 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -1885,21 +1885,21 @@ static void ni_load_channelgain_list(struct comedi_device *dev,
                                aref = AREF_OTHER;
                        switch (aref) {
                        case AREF_DIFF:
-                               hi |= AI_DIFFERENTIAL;
+                               hi |= NI_E_AI_CFG_HI_TYPE_DIFF;
                                break;
                        case AREF_COMMON:
-                               hi |= AI_COMMON;
+                               hi |= NI_E_AI_CFG_HI_TYPE_COMMON;
                                break;
                        case AREF_GROUND:
-                               hi |= AI_GROUND;
+                               hi |= NI_E_AI_CFG_HI_TYPE_GROUND;
                                break;
                        case AREF_OTHER:
                                break;
                        }
                }
-               hi |= AI_CONFIG_CHANNEL(chan);
+               hi |= NI_E_AI_CFG_HI_CHAN(chan);
 
-               ni_writew(dev, hi, Configuration_Memory_High);
+               ni_writew(dev, hi, NI_E_AI_CFG_HI_REG);
 
                if (!devpriv->is_6143) {
                        lo = NI_E_AI_CFG_LO_GAIN(range);

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 8abf78db47bc721d34c36e5055eaaa1ca4990c29..14e4351b0aa80d4c27eff1a9ae1f5b53cdd2ef3d 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -623,17 +623,13 @@ static inline unsigned GPCT_DMA_Select_Mask(unsigned gpct_index)
 #define NI_E_AI_CFG_LO_UNI             BIT(8)
 #define NI_E_AI_CFG_LO_GAIN(x)         ((x) << 0)
 
-#define Configuration_Memory_High      0x12
-enum Configuration_Memory_High_Bits {
-       AI_AC_COUPLE = 0x800,
-       AI_DIFFERENTIAL = 0x1000,
-       AI_COMMON = 0x2000,
-       AI_GROUND = 0x3000,
-};
-static inline unsigned int AI_CONFIG_CHANNEL(unsigned int channel)
-{
-       return channel & 0x3f;
-}
+#define NI_E_AI_CFG_HI_REG             0x12    /* w16 */
+#define NI_E_AI_CFG_HI_TYPE(x)         (((x) & 0x7) << 12)
+#define NI_E_AI_CFG_HI_TYPE_DIFF       NI_E_AI_CFG_HI_TYPE(1)
+#define NI_E_AI_CFG_HI_TYPE_COMMON     NI_E_AI_CFG_HI_TYPE(2)
+#define NI_E_AI_CFG_HI_TYPE_GROUND     NI_E_AI_CFG_HI_TYPE(3)
+#define NI_E_AI_CFG_HI_AC_COUPLE       BIT(11)
+#define NI_E_AI_CFG_HI_CHAN(x)         (((x) & 0x3f) << 0)
 
 #define NI_E_8255_BASE                 0x19    /* rw8 */