regulator: Convert ab8500 to set_voltage_sel

Convert ab8500 to set_voltage_sel and then we can remove
ab8500_get_best_voltage_index function.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index c7ee4c15d6f52c7979558efd9d88919e747f3510..0d095b6e567a9a00bcd57da7a6622b4e66ab3754 100644 (file)
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -234,25 +234,8 @@ static int ab8500_regulator_get_voltage_sel(struct regulator_dev *rdev)
                return val;
 }
 
-static int ab8500_get_best_voltage_index(struct regulator_dev *rdev,
-               int min_uV, int max_uV)
-{
-       struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
-       int i;
-
-       /* check the supported voltage */
-       for (i = 0; i < info->voltages_len; i++) {
-               if ((info->voltages[i] >= min_uV) &&
-                   (info->voltages[i] <= max_uV))
-                       return i;
-       }
-
-       return -EINVAL;
-}
-
-static int ab8500_regulator_set_voltage(struct regulator_dev *rdev,
-                                       int min_uV, int max_uV,
-                                       unsigned *selector)
+static int ab8500_regulator_set_voltage_sel(struct regulator_dev *rdev,
+                                           unsigned selector)
 {
        int ret;
        struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
@@ -263,18 +246,8 @@ static int ab8500_regulator_set_voltage(struct regulator_dev *rdev,
                return -EINVAL;
        }
 
-       /* get the appropriate voltages within the range */
-       ret = ab8500_get_best_voltage_index(rdev, min_uV, max_uV);
-       if (ret < 0) {
-               dev_err(rdev_get_dev(rdev),
-                               "couldn't get best voltage for regulator\n");
-               return ret;
-       }
-
-       *selector = ret;
-
        /* set the registers for the request */
-       regval = (u8)ret;
+       regval = (u8)selector;
        ret = abx500_mask_and_set_register_interruptible(info->dev,
                        info->voltage_bank, info->voltage_reg,
                        info->voltage_mask, regval);
@@ -319,7 +292,7 @@ static struct regulator_ops ab8500_regulator_ops = {
        .disable        = ab8500_regulator_disable,
        .is_enabled     = ab8500_regulator_is_enabled,
        .get_voltage_sel = ab8500_regulator_get_voltage_sel,
-       .set_voltage    = ab8500_regulator_set_voltage,
+       .set_voltage_sel = ab8500_regulator_set_voltage_sel,
        .list_voltage   = ab8500_list_voltage,
        .enable_time    = ab8500_regulator_enable_time,
        .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel,