diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-13 13:44:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-13 13:44:57 +0000 |
| commit | 334a82086d6428ede052c4cd11ee588bcdf2a9e8 (patch) | |
| tree | 33eb7fc1076405e1f032d1c411c2fbf7a1b7562c /drivers/regulator | |
| parent | 67cc6885548427a4f7980b57e6ef32945f6d22b1 (diff) | |
| parent | 75bc9641cadd2a3f91f9c2e7f2fdfdeb8bd4b1d6 (diff) | |
Merge remote-tracking branch 'regulator/topic/constraints' into regulator-linus
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 3fe13130bae..d85f31385b2 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -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_have_populated_dt(); +} + /** * 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"); |