diff options
| author | Matthias Kaehlcke <mka@chromium.org> | 2016-09-14 09:52:05 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-14 18:12:20 +0100 |
| commit | 57995a4860542ea2089558c84f739e12d5ca1059 (patch) | |
| tree | 8160254641b6e52d4262ffa6df36bea89239e05d /drivers/regulator/core.c | |
| parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) | |
| download | linux-57995a4860542ea2089558c84f739e12d5ca1059.tar.gz linux-57995a4860542ea2089558c84f739e12d5ca1059.tar.bz2 linux-57995a4860542ea2089558c84f739e12d5ca1059.zip | |
regulator: core: Use local ops variable in _regulator_do_set_voltage()
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index db320e8fa865..b059e8334567 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2751,6 +2751,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, int best_val = 0; unsigned int selector; int old_selector = -1; + const struct regulator_ops *ops = rdev->desc->ops; trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV); @@ -2762,29 +2763,28 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, * info to call set_voltage_time_sel(). */ if (_regulator_is_enabled(rdev) && - rdev->desc->ops->set_voltage_time_sel && - rdev->desc->ops->get_voltage_sel) { - old_selector = rdev->desc->ops->get_voltage_sel(rdev); + ops->set_voltage_time_sel && ops->get_voltage_sel) { + old_selector = ops->get_voltage_sel(rdev); if (old_selector < 0) return old_selector; } - if (rdev->desc->ops->set_voltage) { + if (ops->set_voltage) { ret = _regulator_call_set_voltage(rdev, min_uV, max_uV, &selector); if (ret >= 0) { - if (rdev->desc->ops->list_voltage) - best_val = rdev->desc->ops->list_voltage(rdev, - selector); + if (ops->list_voltage) + best_val = ops->list_voltage(rdev, + selector); else best_val = _regulator_get_voltage(rdev); } - } else if (rdev->desc->ops->set_voltage_sel) { + } else if (ops->set_voltage_sel) { ret = regulator_map_voltage(rdev, min_uV, max_uV); if (ret >= 0) { - best_val = rdev->desc->ops->list_voltage(rdev, ret); + best_val = ops->list_voltage(rdev, ret); if (min_uV <= best_val && max_uV >= best_val) { selector = ret; if (old_selector == selector) @@ -2804,7 +2804,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, if (ret == 0 && !rdev->constraints->ramp_disable && old_selector >= 0 && old_selector != selector) { - delay = rdev->desc->ops->set_voltage_time_sel(rdev, + delay = ops->set_voltage_time_sel(rdev, old_selector, selector); if (delay < 0) { rdev_warn(rdev, "set_voltage_time_sel() failed: %d\n", |