summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/devres.c
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2016-08-16 11:50:32 -0700
committerMark Brown <broonie@kernel.org>2016-08-16 20:00:44 +0100
commit565f9b073f37e5cb6f80ad0ad71ec1144f87fd9f (patch)
tree355a3ab03e0e431305eff4bafdeaea45baa67203 /drivers/regulator/devres.c
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
downloadlinux-565f9b073f37e5cb6f80ad0ad71ec1144f87fd9f.tar.bz2
regulator: Remove support for optional supplies in the bulk API
The patch was based on my missinterpretation of the API and only accidentally worked for me. Let's clean it out to not confuse others. This reverts commit 3ff3f518a135fa4592fe2817e9ac2cce1fa23dc2. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/devres.c')
-rw-r--r--drivers/regulator/devres.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index 6ad8ab4c578d..6ec1d400adae 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -164,11 +164,8 @@ 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].optional ?
- OPTIONAL_GET :
- NORMAL_GET);
+ consumers[i].consumer = devm_regulator_get(dev,
+ consumers[i].supply);
if (IS_ERR(consumers[i].consumer)) {
ret = PTR_ERR(consumers[i].consumer);
dev_err(dev, "Failed to get supply '%s': %d\n",