Commit b06afa15 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_AO_REF_ATTENUATION_REG bits 



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

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 bae45304

drivers/staging/comedi/drivers/ni_mio_common.c

+2 −2
Original line number Diff line number Diff line
@@ -2675,12 +2675,12 @@ static int ni_m_series_ao_config_chanlist(struct comedi_device *dev, 
			break;

		case 4000000:

			conf |= NI_M_AO_CFG_BANK_REF_INT_10V;

			ni_writeb(dev, MSeries_Attenuate_x5_Bit,

			ni_writeb(dev, NI_M_AO_REF_ATTENUATION_X5,

				  NI_M_AO_REF_ATTENUATION_REG(chan));

			break;

		case 2000000:

			conf |= NI_M_AO_CFG_BANK_REF_INT_5V;

			ni_writeb(dev, MSeries_Attenuate_x5_Bit,

			ni_writeb(dev, NI_M_AO_REF_ATTENUATION_X5,

				  NI_M_AO_REF_ATTENUATION_REG(chan));

			break;

		default:

drivers/staging/comedi/drivers/ni_stc.h

+1 −4
Original line number Diff line number Diff line
@@ -1037,10 +1037,7 @@ static const struct comedi_lrange range_ni_E_ao_ext; 
#define NI_M_CDO_MASK_ENA_REG		0x234

#define NI_M_STATIC_AI_CTRL_REG(x)	((x) ? (0x260 + (x)) : 0x064)

#define NI_M_AO_REF_ATTENUATION_REG(x)	(0x264 + (x))



enum MSeries_AO_Reference_Attenuation_Bits {

	MSeries_Attenuate_x5_Bit = 0x1

};

#define NI_M_AO_REF_ATTENUATION_X5	BIT(0)



static inline unsigned MSeries_Cal_PWM_High_Time_Bits(unsigned count)

{