regulator: mc13xxx: Convert to regulator_list_voltage_table

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 6 insertions, 24 deletions

diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index 3e191715fb25..8a6b050ff5aa 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -80,20 +80,6 @@ static int mc13xxx_regulator_is_enabled(struct regulator_dev *rdev)
         return (val & mc13xxx_regulators[id].enable_bit) != 0;
 }
 
-int mc13xxx_regulator_list_voltage(struct regulator_dev *rdev,
-                                                unsigned selector)
-{
-        int id = rdev_get_id(rdev);
-        struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
-        struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;
-
-        if (selector >= mc13xxx_regulators[id].desc.n_voltages)
-                return -EINVAL;
-
-        return mc13xxx_regulators[id].voltages[selector];
-}
-EXPORT_SYMBOL_GPL(mc13xxx_regulator_list_voltage);
-
 static int mc13xxx_regulator_set_voltage_sel(struct regulator_dev *rdev,
                                              unsigned selector)
 {
@@ -135,14 +121,14 @@ static int mc13xxx_regulator_get_voltage(struct regulator_dev *rdev)
 
         BUG_ON(val >= mc13xxx_regulators[id].desc.n_voltages);
 
-        return mc13xxx_regulators[id].voltages[val];
+        return rdev->desc->volt_table[val];
 }
 
 struct regulator_ops mc13xxx_regulator_ops = {
         .enable = mc13xxx_regulator_enable,
         .disable = mc13xxx_regulator_disable,
         .is_enabled = mc13xxx_regulator_is_enabled,
-        .list_voltage = mc13xxx_regulator_list_voltage,
+        .list_voltage = regulator_list_voltage_table,
         .set_voltage_sel = mc13xxx_regulator_set_voltage_sel,
         .get_voltage = mc13xxx_regulator_get_voltage,
 };
@@ -151,15 +137,13 @@ EXPORT_SYMBOL_GPL(mc13xxx_regulator_ops);
 int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, int min_uV,
                int max_uV, unsigned *selector)
 {
-        struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
-        struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;
         int id = rdev_get_id(rdev);
 
         dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n",
                 __func__, id, min_uV, max_uV);
 
-        if (min_uV <= mc13xxx_regulators[id].voltages[0] &&
-            mc13xxx_regulators[id].voltages[0] <= max_uV)
+        if (min_uV <= rdev->desc->volt_table[0] &&
+            rdev->desc->volt_table[0] <= max_uV)
                 return 0;
         else
                 return -EINVAL;
@@ -168,13 +152,11 @@ EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_set_voltage);
 
 int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev)
 {
-        struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
-        struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;
         int id = rdev_get_id(rdev);
 
         dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
 
-        return mc13xxx_regulators[id].voltages[0];
+        return rdev->desc->volt_table[0];
 }
 EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_get_voltage);
 
@@ -182,7 +164,7 @@ struct regulator_ops mc13xxx_fixed_regulator_ops = {
         .enable = mc13xxx_regulator_enable,
         .disable = mc13xxx_regulator_disable,
         .is_enabled = mc13xxx_regulator_is_enabled,
-        .list_voltage = mc13xxx_regulator_list_voltage,
+        .list_voltage = regulator_list_voltage_table,
         .set_voltage = mc13xxx_fixed_regulator_set_voltage,
         .get_voltage = mc13xxx_fixed_regulator_get_voltage,
 };