regulator: wm8400: Simplify set REGULATOR_MODE_IDLE mode in wm8400_dcdc_set_mode

To set REGULATOR_MODE_IDLE mode, what we do is to clear DC1_ACTIVE and
DC1_SLEEP bits, this can be done in one wm8400_set_bits() call.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 9035dd053611..27c746ef0636 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -120,13 +120,8 @@ static int wm8400_dcdc_set_mode(struct regulator_dev *dev, unsigned int mode)
 
         case REGULATOR_MODE_IDLE:
                 /* Datasheet: standby */
-                ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
-                                      WM8400_DC1_ACTIVE, 0);
-                if (ret != 0)
-                        return ret;
                 return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
-                                       WM8400_DC1_SLEEP, 0);
-
+                                       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP, 0);
         default:
                 return -EINVAL;
         }