2012-08-07 14:21:33

by Axel Lin

Subject: [PATCH RESEND] regulator: ab8500: Set enable enable_time in regulator_desc

Signed-off-by: Axel Lin <[email protected]>
Acked-by: Linus Walleij <[email protected]>
---
drivers/regulator/ab8500.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 13d424f..6230c40 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -238,13 +238,6 @@ static int ab8500_regulator_set_voltage_sel(struct regulator_dev *rdev,
return ret;
}

-static int ab8500_regulator_enable_time(struct regulator_dev *rdev)
-{
- struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
-
- return info->delay;
-}
-
static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev,
unsigned int old_sel,
unsigned int new_sel)
@@ -261,7 +254,6 @@ static struct regulator_ops ab8500_regulator_ops = {
.get_voltage_sel = ab8500_regulator_get_voltage_sel,
.set_voltage_sel = ab8500_regulator_set_voltage_sel,
.list_voltage = regulator_list_voltage_table,
- .enable_time = ab8500_regulator_enable_time,
.set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel,
};

@@ -276,7 +268,6 @@ static struct regulator_ops ab8500_regulator_fixed_ops = {
.is_enabled = ab8500_regulator_is_enabled,
.get_voltage = ab8500_fixed_get_voltage,
.list_voltage = regulator_list_voltage_linear,
- .enable_time = ab8500_regulator_enable_time,
};

static struct ab8500_regulator_info
@@ -374,6 +365,7 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = 1,
.min_uV = 2000000,
+ .enable_time = 10000,
},
.delay = 10000,
.update_bank = 0x03,
--
1.7.9.5

2012-08-07 17:04:04

by Mark Brown

Subject: Re: [PATCH RESEND] regulator: ab8500: Set enable enable_time in regulator_desc

On Tue, Aug 07, 2012 at 10:21:23PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <[email protected]>
> Acked-by: Linus Walleij <[email protected]>

Applied, thanks.