2015-02-26 23:40:26

by Bjorn Andersson

[permalink] [raw]
Subject: [PATCH] regulator: core: Silence EPROBE_DEFER error on bulk_get

As this is already being logged elsewhere we shouldn't spam the log
unnecessarily upon EPROBE_DEFER.

Signed-off-by: Bjorn Andersson <[email protected]>
---

Maybe we should have a dev_dbg() for EPROBE_DEFER to aid finding which
regulator it actually was that it deferred?

drivers/regulator/core.c | 5 +++--
drivers/regulator/devres.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 5467744..4429788 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3148,8 +3148,9 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
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",
- consumers[i].supply, ret);
+ if (ret != -EPROBE_DEFER)
+ dev_err(dev, "Failed to get supply '%s': %d\n",
+ consumers[i].supply, ret);
consumers[i].consumer = NULL;
goto err;
}
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index 8f785bc..7cb9e01 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -168,8 +168,9 @@ int devm_regulator_bulk_get(struct device *dev, int num_consumers,
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",
- consumers[i].supply, ret);
+ if (ret != -EPROBE_DEFER)
+ dev_err(dev, "Failed to get supply '%s': %d\n",
+ consumers[i].supply, ret);
consumers[i].consumer = NULL;
goto err;
}
--
1.8.2.2