regulator: core: Factor out regulator_map_voltage

[linux-drm-fsl-dcu.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 5d161e11d5e6c7bdad5e839d0b28905f75baa4d6..f15b0454871557feeb8417c6b06b89d226dc4dd6 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2606,6 +2606,23 @@ int regulator_is_supported_voltage(struct regulator *regulator,
 }
 EXPORT_SYMBOL_GPL(regulator_is_supported_voltage);
 
+static int regulator_map_voltage(struct regulator_dev *rdev, int min_uV,
+                                int max_uV)
+{
+       const struct regulator_desc *desc = rdev->desc;
+
+       if (desc->ops->map_voltage)
+               return desc->ops->map_voltage(rdev, min_uV, max_uV);
+
+       if (desc->ops->list_voltage == regulator_list_voltage_linear)
+               return regulator_map_voltage_linear(rdev, min_uV, max_uV);
+
+       if (desc->ops->list_voltage == regulator_list_voltage_linear_range)
+               return regulator_map_voltage_linear_range(rdev, min_uV, max_uV);
+
+       return regulator_map_voltage_iterate(rdev, min_uV, max_uV);
+}
+
 static int _regulator_call_set_voltage(struct regulator_dev *rdev,
                                       int min_uV, int max_uV,
                                       unsigned *selector)
@@ -2694,23 +2711,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
                }
 
        } else if (rdev->desc->ops->set_voltage_sel) {
-               if (rdev->desc->ops->map_voltage) {
-                       ret = rdev->desc->ops->map_voltage(rdev, min_uV,
-                                                          max_uV);
-               } else {
-                       if (rdev->desc->ops->list_voltage ==
-                           regulator_list_voltage_linear)
-                               ret = regulator_map_voltage_linear(rdev,
-                                                               min_uV, max_uV);
-                       else if (rdev->desc->ops->list_voltage ==
-                                regulator_list_voltage_linear_range)
-                               ret = regulator_map_voltage_linear_range(rdev,
-                                                               min_uV, max_uV);
-                       else
-                               ret = regulator_map_voltage_iterate(rdev,
-                                                               min_uV, max_uV);
-               }
-
+               ret = regulator_map_voltage(rdev, min_uV, max_uV);
                if (ret >= 0) {
                        best_val = rdev->desc->ops->list_voltage(rdev, ret);
                        if (min_uV <= best_val && max_uV >= best_val) {