Skip to content

Commit

Permalink
regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL…
Browse files Browse the repository at this point in the history
… case

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 <[email protected]>
Reviewed-by: Adam Thomson <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
AxelLin authored and broonie committed Oct 8, 2019
1 parent 5bf2a9e commit be446f1
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/regulator/da9062-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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:
Expand All @@ -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;
}

/*
Expand Down

0 comments on commit be446f1

Please sign in to comment.