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

Rename the CamelCase and convert the inline helper functions
that set the bits in this register to macros.

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 740a92c4b98fc95ceb04e69ea2bc2aa914d07d8c..f1299aed285016082232a6f8c25118959cc4f647 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -4419,8 +4419,8 @@ static int ni_config_filter(struct comedi_device *dev,
                return -ENOTSUPP;
 
        bits = ni_readl(dev, NI_M_PFI_FILTER_REG);
-       bits &= ~MSeries_PFI_Filter_Select_Mask(pfi_channel);
-       bits |= MSeries_PFI_Filter_Select_Bits(pfi_channel, filter);
+       bits &= ~NI_M_PFI_FILTER_SEL_MASK(pfi_channel);
+       bits |= NI_M_PFI_FILTER_SEL(pfi_channel, filter);
        ni_writel(dev, bits, NI_M_PFI_FILTER_REG);
        return 0;
 }

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index be9efdc18693cf10b4cab0ebde7d316ab9740260..983aeee79bdf35d7d95f2e7755032854a2626f94 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -963,6 +963,8 @@ static const struct comedi_lrange range_ni_E_ao_ext;
 #define NI_M_AO_CALIB_REG              0x0a3
 #define NI_M_AO_FIFO_DATA_REG          0x0a4
 #define NI_M_PFI_FILTER_REG            0x0b0
+#define NI_M_PFI_FILTER_SEL(_c, _f)    (((_f) & 0x3) << ((_c) * 2))
+#define NI_M_PFI_FILTER_SEL_MASK(_c)   NI_M_PFI_FILTER_SEL((_c), 0x3)
 #define NI_M_RTSI_FILTER_REG           0x0b4
 #define NI_M_SCXI_LEGACY_COMPAT_REG    0x0bc
 #define NI_M_DAC_DIRECT_DATA_REG(x)    (0x0c0 + ((x) * 4))
@@ -1045,18 +1047,6 @@ static const struct comedi_lrange range_ni_E_ao_ext;
 #define NI_M_AO_REF_ATTENUATION_REG(x) (0x264 + (x))
 #define NI_M_AO_REF_ATTENUATION_X5     BIT(0)
 
-static inline unsigned MSeries_PFI_Filter_Select_Mask(unsigned channel)
-{
-       return 0x3 << (channel * 2);
-}
-
-static inline unsigned MSeries_PFI_Filter_Select_Bits(unsigned channel,
-                                                     unsigned filter)
-{
-       return (filter << (channel *
-                          2)) & MSeries_PFI_Filter_Select_Mask(channel);
-}
-
 enum CDIO_DMA_Select_Bits {
        CDI_DMA_Select_Shift = 0,
        CDI_DMA_Select_Mask = 0xf,