Skip to contentSkip to conversation

regulator: core: Replace checks of have_full_constraints with a function

PATCH In review Mark Brown 4 participants 6 messages Nov 27, 2013 – Nov 29, 2013 Voltage and current regulator framework

lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

PATCH 1/2 regulator: core: Replace checks of have_full_constraints with a function

From: Mark Brown <[email protected]>

Simple code reorganisation so we can change the logic for deciding what full constraints are more easily.

---
 drivers/regulator/core.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/regulator/core.c +8 -3
index 3fe13130baec..02fdf925bb56 100644
@@ -119,6 +119,11 @@ static const char *rdev_get_name(struct regulator_dev *rdev)
 		return "";
 }
 
+static bool have_full_constraints(void)
+{
+	return has_full_constraints;
+}
+
 /**
  * of_get_regulator - get a regulator device node based on supply name
  * @dev: Device pointer for the consumer (of regulator) device
@@ -1340,7 +1345,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
 	 * Assume that a regulator is physically present and enabled
 	 * even if it isn't hooked up and just provide a dummy.
 	 */
-	if (has_full_constraints && allow_dummy) {
+	if (have_full_constraints() && allow_dummy) {
 		pr_warn("%s supply %s not found, using dummy regulator\n",
 			devname, id);
 
@@ -3627,7 +3632,7 @@ int regulator_suspend_finish(void)
 			if (error)
 				ret = error;
 		} else {
-			if (!has_full_constraints)
+			if (!have_full_constraints())
 				goto unlock;
 			if (!ops->disable)
 				goto unlock;
@@ -3825,7 +3830,7 @@ static int __init regulator_init_complete(void)
 		if (!enabled)
 			goto unlock;
 
-		if (has_full_constraints) {
+		if (have_full_constraints()) {
 			/* We log since this may kill the system if it
 			 * goes wrong. */
 			rdev_info(rdev, "disabling\n");
Signature · 1 line
1.8.4.4
author maintainer
#1 lore raw

PATCH 2/2 regulator: core: Check for DT every time we check full constraints

From: Mark Brown <[email protected]>

Eliminate the gap between DT becoming available and this being used to say we have full constraints by checking directly for DT every time we check for full constraints. This improves interoperaton with optional regulator support.

---
 drivers/regulator/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/core.c +1 -1
index 02fdf925bb56..d85f31385b24 100644
@@ -121,7 +121,7 @@ static const char *rdev_get_name(struct regulator_dev *rdev)
 
 static bool have_full_constraints(void)
 {
-	return has_full_constraints;
+	return has_full_constraints || of_have_populated_dt();
 }
 
 /**
Signature · 1 line
1.8.4.4
#2 lore raw

Re: [PATCH 2/2] regulator: core: Check for DT every time we check full constraints

Quoted 17 lines · Mark Brown

From: Mark Brown <[email protected]>

Eliminate the gap between DT becoming available and this being used to say we have full constraints by checking directly for DT every time we check for full constraints. This improves interoperaton with optional regulator support.

---
 drivers/regulator/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/core.c +0 -0
index 02fdf925bb56..d85f31385b24 100644

drivers/regulator/core.c static const char *rdev_get_name(struct regulator_dev *rdev) · line 127

Quoted 8 lines
drivers/regulator/core.c +1 -1
@@ -121,7 +121,7 @@ static const char *rdev_get_name(struct regulator_dev *rdev)
 
 static bool have_full_constraints(void)
 {
-	return has_full_constraints;
+	return has_full_constraints || of_have_populated_dt();
 }
 
 /**

Doesn't this now make this code in regulator_init_complete() redundant..?

	if (of_have_populated_dt())
		has_full_constraints = true;

Or is keeping this to avoid one less variable check a worthwhile optimisation?

Signature · 1 line
Tixy
author maintainer
#3 lore raw

Re: [PATCH 2/2] regulator: core: Check for DT every time we check full constraints

Quoted 5 lines · Jon Medhurst (Tixy)

Doesn't this now make this code in regulator_init_complete() redundant..?

	if (of_have_populated_dt())
		has_full_constraints = true;

Yes, it is a bit redundant now.

Quoted 2 lines

Or is keeping this to avoid one less variable check a worthwhile optimisation?

I expect it can be removed, I just wanted to check that the function wasn't horribly expensive for some silly reason before I actually went and did that.

Tested-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] regulator: core: Check for DT every time we check full constraints

In reply to Mark Brown
Quoted 8 lines · Mark Brown

From: Mark Brown <[email protected]>

Eliminate the gap between DT becoming available and this being used to say we have full constraints by checking directly for DT every time we check for full constraints. This improves interoperaton with optional regulator support.

Thanks, Mark.

This makes LVDS on mx6qsabresd functional again.

Reviewed-by on v1 1/2
#5 lore raw
In reply to Mark Brown
Quoted 9 lines · Mark Brown

From: Mark Brown <[email protected]>

Simple code reorganisation so we can change the logic for deciding what full constraints are more easily.

---
 drivers/regulator/core.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

I see that you've already applied them, but for what it's worth: