regulator: twl: Convert twl[6030|4030]fixed_ops to regulator_list_voltage_linear
authorAxel Lin <axel.lin@ingics.com>
Sat, 22 Dec 2012 05:31:19 +0000 (13:31 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 1 Mar 2013 08:00:00 +0000 (16:00 +0800)
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/twl-regulator.c

index 74508cc62d67baafcc39fb3face73f1e7a810d90..b68df81b6f8f790495461c7bdbe34be792b358eb 100644 (file)
@@ -616,18 +616,8 @@ static struct regulator_ops twl6030ldo_ops = {
 
 /*----------------------------------------------------------------------*/
 
-/*
- * Fixed voltage LDOs don't have a VSEL field to update.
- */
-static int twlfixed_list_voltage(struct regulator_dev *rdev, unsigned index)
-{
-       struct twlreg_info      *info = rdev_get_drvdata(rdev);
-
-       return info->min_mV * 1000;
-}
-
 static struct regulator_ops twl4030fixed_ops = {
-       .list_voltage   = twlfixed_list_voltage,
+       .list_voltage   = regulator_list_voltage_linear,
 
        .enable         = twl4030reg_enable,
        .disable        = twl4030reg_disable,
@@ -639,7 +629,7 @@ static struct regulator_ops twl4030fixed_ops = {
 };
 
 static struct regulator_ops twl6030fixed_ops = {
-       .list_voltage   = twlfixed_list_voltage,
+       .list_voltage   = regulator_list_voltage_linear,
 
        .enable         = twl6030reg_enable,
        .disable        = twl6030reg_disable,
@@ -945,6 +935,7 @@ static const struct twlreg_info TWLFIXED_INFO_##label = { \
                .ops = &operations, \
                .type = REGULATOR_VOLTAGE, \
                .owner = THIS_MODULE, \
+               .min_uV = mVolts * 1000, \
                .enable_time = turnon_delay, \
                }, \
        }