UPSTREAM: regulator: pwm: Drop unneeded pwm_enable() call
authorBoris Brezillon <boris.brezillon@free-electrons.com>
Fri, 3 Jun 2016 08:23:00 +0000 (10:23 +0200)
committerHuang, Tao <huangtao@rock-chips.com>
Mon, 6 Mar 2017 10:28:40 +0000 (18:28 +0800)
Now that the PWM regulator driver implements the ->enable/disable() hooks
we can remove the pwm_enable() call from pwm_regulator_set_voltage().

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 830583004e615a4637eacc77866b84908414d7a0)

Change-Id: I89fba9a44d98ed94ede099b841b7358ba4011e35
Signed-off-by: David Wu <david.wu@rock-chips.com>
drivers/regulator/pwm-regulator.c

index fafa3488e960520752b44b482864401925a22a6f..ab3cc02358434635a542bcc8185eba5f5a2f4400 100644 (file)
@@ -159,11 +159,6 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
                return ret;
        }
 
-       ret = pwm_enable(drvdata->pwm);
-       if (ret) {
-               dev_err(&rdev->dev, "Failed to enable PWM: %d\n", ret);
-               return ret;
-       }
        drvdata->volt_uV = min_uV;
 
        /* Delay required by PWM regulator to settle to the new voltage */