diff options
| author | Matthias Kaehlcke <mka@chromium.org> | 2016-09-14 18:52:07 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-16 18:33:40 +0200 |
| commit | d89564efe79419a093e966a959bf5ba2c94e693f (patch) | |
| tree | ac1627d59ba96725a41ebcba16271e0055f7d654 /drivers/regulator | |
| parent | regulator: core: Simplify error flow in _regulator_do_set_voltage() (diff) | |
| download | linux-d89564efe79419a093e966a959bf5ba2c94e693f.tar.xz linux-d89564efe79419a093e966a959bf5ba2c94e693f.zip | |
regulator: core: Don't skip set_voltage_time when ramp delay disabled
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>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b0076ccf896b..df3028b2a8e9 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -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) { @@ -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) |