Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Matthias Kaehlcke and committed by
Mark Brown
d89564ef 31dfe686

+2 -6
+2 -6
drivers/regulator/core.c
··· 2804 2804 goto out; 2805 2805 2806 2806 /* Call set_voltage_time_sel if successfully obtained old_selector */ 2807 - if (!rdev->constraints->ramp_disable && old_selector >= 0 2808 - && old_selector != selector) { 2809 - 2807 + if (!old_selector >= 0 && old_selector != selector) { 2810 2808 delay = ops->set_voltage_time_sel(rdev, 2811 2809 old_selector, selector); 2812 2810 if (delay < 0) { ··· 3049 3051 else if (rdev->desc->ramp_delay) 3050 3052 ramp_delay = rdev->desc->ramp_delay; 3051 3053 3052 - if (ramp_delay == 0) { 3053 - rdev_warn(rdev, "ramp_delay not set\n"); 3054 + if (ramp_delay == 0) 3054 3055 return 0; 3055 - } 3056 3056 3057 3057 /* sanity check */ 3058 3058 if (!rdev->desc->ops->list_voltage)