regulator: lp87565: Convert to use regulator_set/get_current_limit_regmap

Use regulator_set/get_current_limit_regmap helpers to save some code.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/lp87565-regulator.c b/drivers/regulator/lp87565-regulator.c
index 0418e478c6dc5b934b18119bb57d755773250925..81eb4b890c0cb309d93d40731cb89f5969d1b6b6 100644 (file)
--- a/drivers/regulator/lp87565-regulator.c
+++ b/drivers/regulator/lp87565-regulator.c
@@ -34,6 +34,10 @@
                        .ramp_delay             = _delay,               \
                        .linear_ranges          = _lr,                  \
                        .n_linear_ranges        = ARRAY_SIZE(_lr),      \
+                       .curr_table = lp87565_buck_uA,                  \
+                       .n_current_limits = ARRAY_SIZE(lp87565_buck_uA),\
+                       .csel_reg = (_cr),                              \
+                       .csel_mask = LP87565_BUCK_CTRL_2_ILIM,          \
                },                                                      \
                .ctrl2_reg = _cr,                                       \
        }
@@ -102,44 +106,7 @@ static int lp87565_buck_set_ramp_delay(struct regulator_dev *rdev,
        return 0;
 }
 
-static int lp87565_buck_set_current_limit(struct regulator_dev *rdev,
-                                         int min_uA, int max_uA)
-{
-       int id = rdev_get_id(rdev);
-       struct lp87565 *lp87565 = rdev_get_drvdata(rdev);
-       int i;
-
-       for (i = ARRAY_SIZE(lp87565_buck_uA) - 1; i >= 0; i--) {
-               if (lp87565_buck_uA[i] >= min_uA &&
-                   lp87565_buck_uA[i] <= max_uA)
-                       return regmap_update_bits(lp87565->regmap,
-                                                 regulators[id].ctrl2_reg,
-                                                 LP87565_BUCK_CTRL_2_ILIM,
-                                                 i << __ffs(LP87565_BUCK_CTRL_2_ILIM));
-       }
-
-       return -EINVAL;
-}
-
-static int lp87565_buck_get_current_limit(struct regulator_dev *rdev)
-{
-       int id = rdev_get_id(rdev);
-       struct lp87565 *lp87565 = rdev_get_drvdata(rdev);
-       int ret;
-       unsigned int val;
-
-       ret = regmap_read(lp87565->regmap, regulators[id].ctrl2_reg, &val);
-       if (ret)
-               return ret;
-
-       val = (val & LP87565_BUCK_CTRL_2_ILIM) >>
-              __ffs(LP87565_BUCK_CTRL_2_ILIM);
-
-       return (val < ARRAY_SIZE(lp87565_buck_uA)) ?
-                       lp87565_buck_uA[val] : -EINVAL;
-}
-
-/* Operations permitted on BUCK0, BUCK1 */
+/* Operations permitted on BUCKs */
 static const struct regulator_ops lp87565_buck_ops = {
        .is_enabled             = regulator_is_enabled_regmap,
        .enable                 = regulator_enable_regmap,
@@ -150,8 +117,8 @@ static const struct regulator_ops lp87565_buck_ops = {
        .map_voltage            = regulator_map_voltage_linear_range,
        .set_voltage_time_sel   = regulator_set_voltage_time_sel,
        .set_ramp_delay         = lp87565_buck_set_ramp_delay,
-       .set_current_limit      = lp87565_buck_set_current_limit,
-       .get_current_limit      = lp87565_buck_get_current_limit,
+       .set_current_limit      = regulator_set_current_limit_regmap,
+       .get_current_limit      = regulator_get_current_limit_regmap,
 };
 
 static const struct lp87565_regulator regulators[] = {