| Message ID | 20240710-tcpc-cleanup-v1-13-0ec1f41f4263@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fc64f1ce292d0adb9ac3c8b6e372412bb6aa3052 |
| Headers | show |
| Series | usb: typec: tcpci: few TCPCi & TCPCi-Maxim cleanups (mostly genmask()) | expand |
On Wed, Jul 10, 2024 at 11:36:20AM +0100, André Draszik wrote: > Convert register TCPC_VENDOR_ADC_CTRL1 to using GENMASK() and > FIELD_PREP() so as to keep using a similar approach throughout the code > base and make it arguably easier to read. > > Signed-off-by: André Draszik <andre.draszik@linaro.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/tcpm/maxim_contaminant.c | 7 ++++--- > drivers/usb/typec/tcpm/tcpci_maxim.h | 3 +-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec/tcpm/maxim_contaminant.c > index cf9887de96c9..7bfec45e8f4f 100644 > --- a/drivers/usb/typec/tcpm/maxim_contaminant.c > +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c > @@ -76,8 +76,8 @@ static int max_contaminant_read_adc_mv(struct max_tcpci_chip *chip, enum fladc_s > int ret; > > /* Channel & scale select */ > - ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL_MASK, > - channel << ADC_CHANNEL_OFFSET); > + ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL, > + FIELD_PREP(ADCINSEL, channel)); > if (ret < 0) > return ret; > > @@ -96,7 +96,8 @@ static int max_contaminant_read_adc_mv(struct max_tcpci_chip *chip, enum fladc_s > if (ret < 0) > return ret; > > - ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL_MASK, 0); > + ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL, > + FIELD_PREP(ADCINSEL, 0)); > if (ret < 0) > return ret; > > diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.h b/drivers/usb/typec/tcpm/tcpci_maxim.h > index 34076069444f..a41ca9e7ad08 100644 > --- a/drivers/usb/typec/tcpm/tcpci_maxim.h > +++ b/drivers/usb/typec/tcpm/tcpci_maxim.h > @@ -37,8 +37,7 @@ > #define WTRCYCLE_4_8_S 1 > > #define TCPC_VENDOR_ADC_CTRL1 0x91 > -#define ADCINSEL_MASK GENMASK(7, 5) > -#define ADC_CHANNEL_OFFSET 5 > +#define ADCINSEL GENMASK(7, 5) > #define ADCEN BIT(0) > > enum contamiant_state { > > -- > 2.45.2.803.g4e1b14247a-goog
diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec/tcpm/maxim_contaminant.c index cf9887de96c9..7bfec45e8f4f 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -76,8 +76,8 @@ static int max_contaminant_read_adc_mv(struct max_tcpci_chip *chip, enum fladc_s int ret; /* Channel & scale select */ - ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL_MASK, - channel << ADC_CHANNEL_OFFSET); + ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL, + FIELD_PREP(ADCINSEL, channel)); if (ret < 0) return ret; @@ -96,7 +96,8 @@ static int max_contaminant_read_adc_mv(struct max_tcpci_chip *chip, enum fladc_s if (ret < 0) return ret; - ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL_MASK, 0); + ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL, + FIELD_PREP(ADCINSEL, 0)); if (ret < 0) return ret; diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.h b/drivers/usb/typec/tcpm/tcpci_maxim.h index 34076069444f..a41ca9e7ad08 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim.h +++ b/drivers/usb/typec/tcpm/tcpci_maxim.h @@ -37,8 +37,7 @@ #define WTRCYCLE_4_8_S 1 #define TCPC_VENDOR_ADC_CTRL1 0x91 -#define ADCINSEL_MASK GENMASK(7, 5) -#define ADC_CHANNEL_OFFSET 5 +#define ADCINSEL GENMASK(7, 5) #define ADCEN BIT(0) enum contamiant_state {
Convert register TCPC_VENDOR_ADC_CTRL1 to using GENMASK() and FIELD_PREP() so as to keep using a similar approach throughout the code base and make it arguably easier to read. Signed-off-by: André Draszik <andre.draszik@linaro.org> --- drivers/usb/typec/tcpm/maxim_contaminant.c | 7 ++++--- drivers/usb/typec/tcpm/tcpci_maxim.h | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-)