Re: [PATCH 12/15] usb: typec: tcpm/tcpci_maxim: use GENMASK() for TCPC_VENDOR_CC_CTRL3 register

[Heikki Krogerus]

On Wed, Jul 10, 2024 at 11:36:19AM +0100, André Draszik wrote:
> Convert register TCPC_VENDOR_CC_CTRL3 to using GENMASK() 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@xxxxxxxxxx>

Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>

> ---
>  drivers/usb/typec/tcpm/maxim_contaminant.c | 9 +++++----
>  drivers/usb/typec/tcpm/tcpci_maxim.h       | 9 +++------
>  2 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec/tcpm/maxim_contaminant.c
> index f7acaa42329f..cf9887de96c9 100644
> --- a/drivers/usb/typec/tcpm/maxim_contaminant.c
> +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c
> @@ -283,10 +283,11 @@ static int max_contaminant_enable_dry_detection(struct max_tcpci_chip *chip)
>  	u8 temp;
>  	int ret;
>  
> -	ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL3, CCWTRDEB_MASK | CCWTRSEL_MASK
> -				    | WTRCYCLE_MASK, CCWTRDEB_1MS << CCWTRDEB_SHIFT |
> -				    CCWTRSEL_1V << CCWTRSEL_SHIFT | WTRCYCLE_4_8_S <<
> -				    WTRCYCLE_SHIFT);
> +	ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL3,
> +				 CCWTRDEB | CCWTRSEL | WTRCYCLE,
> +				 FIELD_PREP(CCWTRDEB, CCWTRDEB_1MS)
> +				 | FIELD_PREP(CCWTRSEL, CCWTRSEL_1V)
> +				 | FIELD_PREP(WTRCYCLE, WTRCYCLE_4_8_S));
>  	if (ret < 0)
>  		return ret;
>  
> diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.h b/drivers/usb/typec/tcpm/tcpci_maxim.h
> index 92c9a628ebe1..34076069444f 100644
> --- a/drivers/usb/typec/tcpm/tcpci_maxim.h
> +++ b/drivers/usb/typec/tcpm/tcpci_maxim.h
> @@ -27,15 +27,12 @@
>  #define UA_80_SRC                               3
>  
>  #define TCPC_VENDOR_CC_CTRL3                    0x8e
> -#define CCWTRDEB_MASK                           GENMASK(7, 6)
> -#define CCWTRDEB_SHIFT                          6
> +#define CCWTRDEB                                GENMASK(7, 6)
>  #define CCWTRDEB_1MS                            1
> -#define CCWTRSEL_MASK                           GENMASK(5, 3)
> -#define CCWTRSEL_SHIFT                          3
> +#define CCWTRSEL                                GENMASK(5, 3)
>  #define CCWTRSEL_1V                             0x4
>  #define CCLADDERDIS                             BIT(2)
> -#define WTRCYCLE_MASK                           BIT(0)
> -#define WTRCYCLE_SHIFT                          0
> +#define WTRCYCLE                                GENMASK(0, 0)
>  #define WTRCYCLE_2_4_S                          0
>  #define WTRCYCLE_4_8_S                          1
>  
> 
> -- 
> 2.45.2.803.g4e1b14247a-goog

-- 
heikki