aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2016-09-14 12:52:05 -0400
committerMark Brown <broonie@kernel.org>2016-09-14 13:12:20 -0400
commit57995a4860542ea2089558c84f739e12d5ca1059 (patch)
tree8160254641b6e52d4262ffa6df36bea89239e05d
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
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>
-rw-r--r--drivers/regulator/core.c20
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,
2751 int best_val = 0; 2751 int best_val = 0;
2752 unsigned int selector; 2752 unsigned int selector;
2753 int old_selector = -1; 2753 int old_selector = -1;
2754 const struct regulator_ops *ops = rdev->desc->ops;
2754 2755
2755 trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV); 2756 trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV);
2756 2757
@@ -2762,29 +2763,28 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
2762 * info to call set_voltage_time_sel(). 2763 * info to call set_voltage_time_sel().
2763 */ 2764 */
2764 if (_regulator_is_enabled(rdev) && 2765 if (_regulator_is_enabled(rdev) &&
2765 rdev->desc->ops->set_voltage_time_sel && 2766 ops->set_voltage_time_sel && ops->get_voltage_sel) {
2766 rdev->desc->ops->get_voltage_sel) { 2767 old_selector = ops->get_voltage_sel(rdev);
2767 old_selector = rdev->desc->ops->get_voltage_sel(rdev);
2768 if (old_selector < 0) 2768 if (old_selector < 0)
2769 return old_selector; 2769 return old_selector;
2770 } 2770 }
2771 2771
2772 if (rdev->desc->ops->set_voltage) { 2772 if (ops->set_voltage) {
2773 ret = _regulator_call_set_voltage(rdev, min_uV, max_uV, 2773 ret = _regulator_call_set_voltage(rdev, min_uV, max_uV,
2774 &selector); 2774 &selector);
2775 2775
2776 if (ret >= 0) { 2776 if (ret >= 0) {
2777 if (rdev->desc->ops->list_voltage) 2777 if (ops->list_voltage)
2778 best_val = rdev->desc->ops->list_voltage(rdev, 2778 best_val = ops->list_voltage(rdev,
2779 selector); 2779 selector);
2780 else 2780 else
2781 best_val = _regulator_get_voltage(rdev); 2781 best_val = _regulator_get_voltage(rdev);
2782 } 2782 }
2783 2783
2784 } else if (rdev->desc->ops->set_voltage_sel) { 2784 } else if (ops->set_voltage_sel) {
2785 ret = regulator_map_voltage(rdev, min_uV, max_uV); 2785 ret = regulator_map_voltage(rdev, min_uV, max_uV);
2786 if (ret >= 0) { 2786 if (ret >= 0) {
2787 best_val = rdev->desc->ops->list_voltage(rdev, ret); 2787 best_val = ops->list_voltage(rdev, ret);
2788 if (min_uV <= best_val && max_uV >= best_val) { 2788 if (min_uV <= best_val && max_uV >= best_val) {
2789 selector = ret; 2789 selector = ret;
2790 if (old_selector == selector) 2790 if (old_selector == selector)
@@ -2804,7 +2804,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
2804 if (ret == 0 && !rdev->constraints->ramp_disable && old_selector >= 0 2804 if (ret == 0 && !rdev->constraints->ramp_disable && old_selector >= 0
2805 && old_selector != selector) { 2805 && old_selector != selector) {
2806 2806
2807 delay = rdev->desc->ops->set_voltage_time_sel(rdev, 2807 delay = ops->set_voltage_time_sel(rdev,
2808 old_selector, selector); 2808 old_selector, selector);
2809 if (delay < 0) { 2809 if (delay < 0) {
2810 rdev_warn(rdev, "set_voltage_time_sel() failed: %d\n", 2810 rdev_warn(rdev, "set_voltage_time_sel() failed: %d\n",