diff options
| author | Bjorn Andersson <bjorn.andersson@sonymobile.com> | 2015-11-09 22:20:37 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-17 18:54:07 +0000 |
| commit | 3ff3f518a135fa4592fe2817e9ac2cce1fa23dc2 (patch) | |
| tree | 442835eec00be4e89cbca34a48c1c40b0cde629b /drivers/regulator | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
| download | op-kernel-dev-3ff3f518a135fa4592fe2817e9ac2cce1fa23dc2.zip op-kernel-dev-3ff3f518a135fa4592fe2817e9ac2cce1fa23dc2.tar.gz | |
regulator: Make bulk API support optional supplies
Make it possible to use the bulk API with optional supplies, by allowing
the consumer to marking supplies as optional in the regulator_bulk_data.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 6 | ||||
| -rw-r--r-- | drivers/regulator/devres.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 73b7683..4cf1390 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3451,8 +3451,10 @@ int regulator_bulk_get(struct device *dev, int num_consumers, consumers[i].consumer = NULL; for (i = 0; i < num_consumers; i++) { - consumers[i].consumer = regulator_get(dev, - consumers[i].supply); + consumers[i].consumer = _regulator_get(dev, + consumers[i].supply, + false, + !consumers[i].optional); if (IS_ERR(consumers[i].consumer)) { ret = PTR_ERR(consumers[i].consumer); dev_err(dev, "Failed to get supply '%s': %d\n", diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c index 6ec1d40..6ad8ab4 100644 --- a/drivers/regulator/devres.c +++ b/drivers/regulator/devres.c @@ -164,8 +164,11 @@ int devm_regulator_bulk_get(struct device *dev, int num_consumers, consumers[i].consumer = NULL; for (i = 0; i < num_consumers; i++) { - consumers[i].consumer = devm_regulator_get(dev, - consumers[i].supply); + consumers[i].consumer = _devm_regulator_get(dev, + consumers[i].supply, + consumers[i].optional ? + OPTIONAL_GET : + NORMAL_GET); if (IS_ERR(consumers[i].consumer)) { ret = PTR_ERR(consumers[i].consumer); dev_err(dev, "Failed to get supply '%s': %d\n", |
