[PATCH RFT 2/2] regulator: palmas: Convert palmas_ops_ldo to [get|set]_voltage_sel_regmap

[Axel Lin]

Also remove palmas_ldo_write() function because it is not used after this
conversion.

Signed-off-by: Axel Lin <axel....@gmail.com>
---
 drivers/regulator/palmas-regulator.c |   55 ++++------------------------------
 1 file changed, 5 insertions(+), 50 deletions(-)

diff --git a/drivers/regulator/palmas-regulator.c 
b/drivers/regulator/palmas-regulator.c
index 9e3e7f3..1307194 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -194,16 +194,6 @@ static int palmas_ldo_read(struct palmas *palmas, unsigned 
int reg,
        return regmap_read(palmas->regmap[REGULATOR_SLAVE], addr, dest);
 }
 
-static int palmas_ldo_write(struct palmas *palmas, unsigned int reg,
-               unsigned int value)
-{
-       unsigned int addr;
-
-       addr = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE, reg);
-
-       return regmap_write(palmas->regmap[REGULATOR_SLAVE], addr, value);
-}
-
 static int palmas_is_enabled_smps(struct regulator_dev *dev)
 {
        struct palmas_pmic *pmic = rdev_get_drvdata(dev);
@@ -443,44 +433,6 @@ static int palmas_list_voltage_ldo(struct regulator_dev 
*dev,
        return  850000 + (selector * 50000);
 }
 
-static int palmas_get_voltage_ldo_sel(struct regulator_dev *dev)
-{
-       struct palmas_pmic *pmic = rdev_get_drvdata(dev);
-       int id = rdev_get_id(dev);
-       int selector;
-       unsigned int reg;
-       unsigned int addr;
-
-       addr = palmas_regs_info[id].vsel_addr;
-
-       palmas_ldo_read(pmic->palmas, addr, &reg);
-
-       selector = reg & PALMAS_LDO1_VOLTAGE_VSEL_MASK;
-
-       /* Adjust selector to match list_voltage ranges */
-       if (selector > 49)
-               selector = 49;
-
-       return selector;
-}
-
-static int palmas_set_voltage_ldo_sel(struct regulator_dev *dev,
-               unsigned selector)
-{
-       struct palmas_pmic *pmic = rdev_get_drvdata(dev);
-       int id = rdev_get_id(dev);
-       unsigned int reg = 0;
-       unsigned int addr;
-
-       addr = palmas_regs_info[id].vsel_addr;
-
-       reg = selector;
-
-       palmas_ldo_write(pmic->palmas, addr, reg);
-
-       return 0;
-}
-
 static int palmas_map_voltage_ldo(struct regulator_dev *rdev,
                int min_uV, int max_uV)
 {
@@ -505,8 +457,8 @@ static struct regulator_ops palmas_ops_ldo = {
        .is_enabled             = palmas_is_enabled_ldo,
        .enable                 = regulator_enable_regmap,
        .disable                = regulator_disable_regmap,
-       .get_voltage_sel        = palmas_get_voltage_ldo_sel,
-       .set_voltage_sel        = palmas_set_voltage_ldo_sel,
+       .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+       .set_voltage_sel        = regulator_set_voltage_sel_regmap,
        .list_voltage           = palmas_list_voltage_ldo,
        .map_voltage            = palmas_map_voltage_ldo,
 };
@@ -757,6 +709,9 @@ static __devinit int palmas_probe(struct platform_device 
*pdev)
 
                pmic->desc[id].type = REGULATOR_VOLTAGE;
                pmic->desc[id].owner = THIS_MODULE;
+               pmic->desc[id].vsel_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,
+                                               palmas_regs_info[id].vsel_addr);
+               pmic->desc[id].vsel_mask = PALMAS_LDO1_VOLTAGE_VSEL_MASK;
                pmic->desc[id].enable_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,
                                                palmas_regs_info[id].ctrl_addr);
                pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;
-- 
1.7.9.5



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/