RE: [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case

[Adam Thomson]

On 26 September 2019 06:51, Axel Lin wrote:

> The sleep flag bit decides the mode for BUCK_MODE_MANUAL case, simplify
> the logic as the result is the same.
> 
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>

This patch will need to be rebased on Marco's update titled:

	"regulator: da9062: fix suspend_enable/disable preparation"

However, changes look fine so:

Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@xxxxxxxxxxx>

> ---
>  drivers/regulator/da9062-regulator.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/regulator/da9062-regulator.c b/drivers/regulator/da9062-
> regulator.c
> index 710e67081d53..739a40f256f6 100644
> --- a/drivers/regulator/da9062-regulator.c
> +++ b/drivers/regulator/da9062-regulator.c
> @@ -136,7 +136,7 @@ static int da9062_buck_set_mode(struct regulator_dev
> *rdev, unsigned mode)
>  static unsigned da9062_buck_get_mode(struct regulator_dev *rdev)
>  {
>  	struct da9062_regulator *regl = rdev_get_drvdata(rdev);
> -	unsigned int val, mode = 0;
> +	unsigned int val;
>  	int ret;
> 
>  	ret = regmap_field_read(regl->mode, &val);
> @@ -146,7 +146,6 @@ static unsigned da9062_buck_get_mode(struct
> regulator_dev *rdev)
>  	switch (val) {
>  	default:
>  	case BUCK_MODE_MANUAL:
> -		mode = REGULATOR_MODE_FAST |
> REGULATOR_MODE_STANDBY;
>  		/* Sleep flag bit decides the mode */
>  		break;
>  	case BUCK_MODE_SLEEP:
> @@ -162,11 +161,9 @@ static unsigned da9062_buck_get_mode(struct
> regulator_dev *rdev)
>  		return 0;
> 
>  	if (val)
> -		mode &= REGULATOR_MODE_STANDBY;
> +		return REGULATOR_MODE_STANDBY;
>  	else
> -		mode &= REGULATOR_MODE_NORMAL |
> REGULATOR_MODE_FAST;
> -
> -	return mode;
> +		return REGULATOR_MODE_FAST;
>  }
> 
>  /*
> --
> 2.20.1