[PATCH] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

[PATCH] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

[J Keerthy]

The min and max values for regulators are getting assigned before actually
the voltage is set. So making sure that min and max values are assigned
only if the voltage is successfully set else keeping the last successfully
set voltage's min and max values.

This is boot tested on OMAP4430 and OMAP4460 boards.

Signed-off-by: J Keerthy <j-keerthy@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> 
---
 drivers/regulator/core.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 2785843..12140fb 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -81,6 +81,8 @@ struct regulator {
 	int uA_load;
 	int min_uV;
 	int max_uV;
+	int curr_min_uV;
+	int curr_max_uV;
 	char *supply_name;
 	struct device_attribute dev_attr;
 	struct regulator_dev *rdev;
@@ -2315,6 +2317,8 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
 	ret = regulator_check_voltage(rdev, &min_uV, &max_uV);
 	if (ret < 0)
 		goto out;
+	regulator->curr_min_uV = regulator->min_uV;
+	regulator->curr_max_uV = regulator->max_uV;
 	regulator->min_uV = min_uV;
 	regulator->max_uV = max_uV;
 
@@ -2325,6 +2329,11 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
 	ret = _regulator_do_set_voltage(rdev, min_uV, max_uV);
 
 out:
+	if (ret) {
+		regulator->min_uV = regulator->curr_min_uV;
+		regulator->max_uV = regulator->curr_max_uV;
+	}
+
 	mutex_unlock(&rdev->mutex);
 	return ret;
 }
-- 
1.7.5.4

RE: [PATCH] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

[J, KEERTHY]

Hi Mark/Liam,

Any comments in this?

Regards,
Keerthy

-----Original Message-----
From: J, KEERTHY 
Sent: Friday, February 01, 2013 10:35 AM
To: linux-kernel@vger.kernel.org; lgirdwood@gmail.com; broonie@opensource.wolfsonmicro.com
Cc: J, KEERTHY
Subject: [PATCH] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

The min and max values for regulators are getting assigned before actually
the voltage is set. So making sure that min and max values are assigned
only if the voltage is successfully set else keeping the last successfully
set voltage's min and max values.

This is boot tested on OMAP4430 and OMAP4460 boards.

Signed-off-by: J Keerthy <j-keerthy@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> 
---
 drivers/regulator/core.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 2785843..12140fb 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -81,6 +81,8 @@ struct regulator {
 	int uA_load;
 	int min_uV;
 	int max_uV;
+	int curr_min_uV;
+	int curr_max_uV;
 	char *supply_name;
 	struct device_attribute dev_attr;
 	struct regulator_dev *rdev;
@@ -2315,6 +2317,8 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
 	ret = regulator_check_voltage(rdev, &min_uV, &max_uV);
 	if (ret < 0)
 		goto out;
+	regulator->curr_min_uV = regulator->min_uV;
+	regulator->curr_max_uV = regulator->max_uV;
 	regulator->min_uV = min_uV;
 	regulator->max_uV = max_uV;
 
@@ -2325,6 +2329,11 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
 	ret = _regulator_do_set_voltage(rdev, min_uV, max_uV);
 
 out:
+	if (ret) {
+		regulator->min_uV = regulator->curr_min_uV;
+		regulator->max_uV = regulator->curr_max_uV;
+	}
+
 	mutex_unlock(&rdev->mutex);
 	return ret;
 }
-- 
1.7.5.4

Re: [PATCH] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

On Mon, Feb 04, 2013 at 11:53:20AM +0000, J, KEERTHY wrote:
> Hi Mark/Liam,
> 
> Any comments in this?

Don't top post and a reasonable amount of time for a reply.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

On Fri, Feb 01, 2013 at 10:34:58AM +0530, J Keerthy wrote:

> +++ b/drivers/regulator/core.c
> @@ -81,6 +81,8 @@ struct regulator {
>  	int uA_load;
>  	int min_uV;
>  	int max_uV;
> +	int curr_min_uV;
> +	int curr_max_uV;

This change makes sense but I don't see why we need to add these to
struct regulator - why not just store the values locally for unwinding?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

RE: [PATCH] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

[J, KEERTHY]

Hi Mark,

> -----Original Message-----
> From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com]
> Sent: Friday, February 08, 2013 4:59 PM
> To: J, KEERTHY
> Cc: linux-kernel@vger.kernel.org; lgirdwood@gmail.com
> Subject: Re: [PATCH] Regulator: Reorder the min max assignment in the
> sequence of regulator_set_voltage function
> 
> On Fri, Feb 01, 2013 at 10:34:58AM +0530, J Keerthy wrote:
> 
> > +++ b/drivers/regulator/core.c
> > @@ -81,6 +81,8 @@ struct regulator {
> >  	int uA_load;
> >  	int min_uV;
> >  	int max_uV;
> > +	int curr_min_uV;
> > +	int curr_max_uV;
> 
> This change makes sense but I don't see why we need to add these to
> struct regulator - why not just store the values locally for unwinding?

Ok. I will send an updated patch. Thanks for the response
And sorry for the top posting.

Regards,
Keerthy