From: Boris Brezillon Date: Fri, 3 Jun 2016 08:23:00 +0000 (+0200) Subject: UPSTREAM: regulator: pwm: Drop unneeded pwm_enable() call X-Git-Tag: firefly_0821_release~436 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d1b4c71db8e6247e654ab32383f7ff0dc431405f;p=firefly-linux-kernel-4.4.55.git UPSTREAM: regulator: pwm: Drop unneeded pwm_enable() call 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 Signed-off-by: Mark Brown (cherry picked from commit 830583004e615a4637eacc77866b84908414d7a0) Change-Id: I89fba9a44d98ed94ede099b841b7358ba4011e35 Signed-off-by: David Wu --- diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c index fafa3488e960..ab3cc0235843 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -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 */