diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-05-01 14:58:41 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-09 19:05:05 +0200 |
| commit | b06afa15400182ee5d46b97462fc179ce36b0107 (patch) | |
| tree | 774bd29498f602becf14e87642988c58b73bde74 | |
| parent | staging: comedi: ni_stc.h: tidy up NI_M_AO_CFG_BANK_REG bits (diff) | |
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 7f4e9d6df8fe..c100c0875e75 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -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: diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index bde58031dba3..1ad7981914bb 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -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) { |