2010-01-28 10:21:11

by Mark Brown

Subject: [PATCH] regulator: Convert fixed voltage regulator to use enable_time()

It had an open coded version in enable().

Signed-off-by: Mark Brown <[email protected]>
---
drivers/regulator/fixed.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index ee3e7eb..a3d3bfc 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -50,8 +50,6 @@ static int fixed_voltage_enable(struct regulator_dev *dev)
if (gpio_is_valid(data->gpio)) {
gpio_set_value_cansleep(data->gpio, data->enable_high);
data->is_enabled = 1;
- if (data->startup_delay)
- udelay(data->startup_delay);
}

return 0;
@@ -69,6 +67,13 @@ static int fixed_voltage_disable(struct regulator_dev *dev)
return 0;
}

+static int fixed_voltage_enable_time(struct regulator_dev *dev)
+{
+ struct fixed_voltage_data *data = rdev_get_drvdata(dev);
+
+ return data->startup_delay;
+}
+
static int fixed_voltage_get_voltage(struct regulator_dev *dev)
{
struct fixed_voltage_data *data = rdev_get_drvdata(dev);
@@ -91,6 +96,7 @@ static struct regulator_ops fixed_voltage_ops = {
.is_enabled = fixed_voltage_is_enabled,
.enable = fixed_voltage_enable,
.disable = fixed_voltage_disable,
+ .enable_time = fixed_voltage_enable_time,
.get_voltage = fixed_voltage_get_voltage,
.list_voltage = fixed_voltage_list_voltage,
};
--
1.6.6

2010-01-28 19:16:41

by Liam Girdwood

Subject: Re: [PATCH] regulator: Convert fixed voltage regulator to use enable_time()

On Thu, 2010-01-28 at 10:21 +0000, Mark Brown wrote:
> It had an open coded version in enable().
>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/regulator/fixed.c | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>

Applied.

Thanks

Liam