Skip to contentSkip to conversation

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

PATCH In review J Keerthy 2 participants 4 messages Feb 11, 2013 – Feb 12, 2013 Voltage and current regulator framework

lore
Share & tools
lore

J Keerthy

author
#0 lore raw

PATCH v2 1/1 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.

V2: Fixed comment from Mark. Introduced local variables to hold current min and max values.

---
 drivers/regulator/core.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
drivers/regulator/core.c +10 -2
index 2785843..44a9b84 100644
@@ -2293,7 +2293,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
 int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
 {
 	struct regulator_dev *rdev = regulator->rdev;
-	int ret = 0;
+	int ret = 0, curr_min, curr_max;
 
 	mutex_lock(&rdev->mutex);
 
@@ -2315,15 +2315,23 @@ 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;
+	curr_min = regulator->min_uV;
+	curr_max = regulator->max_uV;
 	regulator->min_uV = min_uV;
 	regulator->max_uV = max_uV;
 
 	ret = regulator_check_consumers(rdev, &min_uV, &max_uV);
 	if (ret < 0)
-		goto out;
+		goto err;
 
 	ret = _regulator_do_set_voltage(rdev, min_uV, max_uV);
 
+err:
+	if (ret) {
+		regulator->min_uV = curr_min;
+		regulator->max_uV = curr_max;
+	}
+
 out:
 	mutex_unlock(&rdev->mutex);
 	return ret;
Signature · 1 line
1.7.5.4
#1 lore raw
Quoted 6 lines · 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.

This seems fine but doesn't apply against topic/core or -next, can you please regenerate against topic/core and resend?

Quoted 2 lines

V2: Fixed comment from Mark. Introduced local variables to hold current min and max values.

Don't include things like this in the changelog, include them after the --- as covered in SubmittingPatches.

author
#2 lore raw
Quoted 17 lines

-----Original Message-----
From: Mark Brown [mailto:[email protected]]
Sent: Monday, February 11, 2013 10:35 PM
To: J, KEERTHY
Cc: [email protected]; [email protected]
Subject: Re: [PATCH V2] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

Quoted 4 lines · 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.

Quoted 4 lines
Quoted 1 line

This is boot tested on OMAP4430 and OMAP4460 boards.

This seems fine but doesn't apply against topic/core or -next, can you please regenerate against topic/core and resend?

Ok. I will rebase.

Quoted 6 lines
Quoted 3 lines

V2: Fixed comment from Mark. Introduced local variables to hold current min and max values.

Don't include things like this in the changelog, include them after the --- as covered in SubmittingPatches.

Ok.

author
#3 lore raw
In reply to Mark Brown

Hi Mark,

Quoted 15 lines

-----Original Message-----
From: Mark Brown [mailto:[email protected]]
Sent: Monday, February 11, 2013 10:35 PM
To: J, KEERTHY
Cc: [email protected]; [email protected]
Subject: Re: [PATCH V2] Regulator: Reorder the min max assignment in the sequence of regulator_set_voltage function

Quoted 4 lines · 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.

Quoted 4 lines
Quoted 1 line

This is boot tested on OMAP4430 and OMAP4460 boards.

This seems fine but doesn't apply against topic/core or -next, can you please regenerate against topic/core and resend?

I pulled the topic/core on to my tree. Seems like the exact fix has Already been made in that branch :-P.

commit 92d7a55879c01b30349045501108e775655a4b92

Author: Paolo Pisati <[email protected]>
Date:   Thu Dec 13 10:13:00 2012 +0100

regulator: core: if voltage scaling fails, restore original voltage values

It is already taken care.

Quoted 6 lines
Quoted 3 lines

V2: Fixed comment from Mark. Introduced local variables to hold current min and max values.

Don't include things like this in the changelog, include them after the --- as covered in SubmittingPatches.

Ok

Thanks,
Keerthy