Skip to content

Commit

Permalink
regulator: core: Don't skip set_voltage_time when ramp delay disabled
Browse files Browse the repository at this point in the history
The current code assumes that only the ramp_delay is used to determine
the time needed for the voltage to stabilize. This may be true for the
calculation done by regulator_set_voltage_time_sel(), however regulators
can implement their own set_voltage_time_sel() op which would be skipped
if no ramp delay is specified. Remove the check in
_regulator_do_set_voltage(), the functions calculating the ramp delay
return 0 anyway when the ramp delay is not configured.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Matthias Kaehlcke authored and Mark Brown committed Sep 16, 2016
1 parent 31dfe68 commit d89564e
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2804,9 +2804,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
goto out;

/* Call set_voltage_time_sel if successfully obtained old_selector */
if (!rdev->constraints->ramp_disable && old_selector >= 0
&& old_selector != selector) {

if (!old_selector >= 0 && old_selector != selector) {
delay = ops->set_voltage_time_sel(rdev,
old_selector, selector);
if (delay < 0) {
Expand Down Expand Up @@ -3051,10 +3049,8 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
else if (rdev->desc->ramp_delay)
ramp_delay = rdev->desc->ramp_delay;

if (ramp_delay == 0) {
rdev_warn(rdev, "ramp_delay not set\n");
if (ramp_delay == 0)
return 0;
}

/* sanity check */
if (!rdev->desc->ops->list_voltage)
Expand Down

0 comments on commit d89564e

Please sign in to comment.