Commit 0dee7ecc authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43e9d883

drivers/staging/comedi/drivers/ni_mio_common.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/comedi/drivers/ni_stc.h

+2 −12
Original line number Diff line number Diff line
@@ -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,