From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko Stuebner) Date: Tue, 10 Mar 2015 00:22:06 +0100 Subject: [PATCH 1/3] regulator: don't emit errors in {devm_}regulator_bulk_get when defering In-Reply-To: <1429128.MSqYm0qZ9p@phil> References: <1429128.MSqYm0qZ9p@phil> Message-ID: <9261130.uPvufuEFrr@phil> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org When {devm_}regulator_get returns -EPROBE_DEFER the driver in question will try probing again at a later time. So don't spam the log with failure messages as this is an expected result of probe ordering. Signed-off-by: Heiko Stuebner --- 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 52af1d7..07ca6cb 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3163,8 +3163,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 6ec1d40..78e460d 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; } -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: [PATCH 1/3] regulator: don't emit errors in {devm_}regulator_bulk_get when defering Date: Tue, 10 Mar 2015 00:22:06 +0100 Message-ID: <9261130.uPvufuEFrr@phil> References: <1429128.MSqYm0qZ9p@phil> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1429128.MSqYm0qZ9p@phil> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Philipp Zabel , broonie@kernel.org Cc: Fabio Estevam , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Kumar Gala , dianders@chromium.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , dri-devel@lists.freedesktop.org, Yakir Yang , Andy Yan , Mark Rutland , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org V2hlbiB7ZGV2bV99cmVndWxhdG9yX2dldCByZXR1cm5zIC1FUFJPQkVfREVGRVIgdGhlIGRyaXZl ciBpbiBxdWVzdGlvbiB3aWxsCnRyeSBwcm9iaW5nIGFnYWluIGF0IGEgbGF0ZXIgdGltZS4gU28g ZG9uJ3Qgc3BhbSB0aGUgbG9nIHdpdGggZmFpbHVyZSBtZXNzYWdlcwphcyB0aGlzIGlzIGFuIGV4 cGVjdGVkIHJlc3VsdCBvZiBwcm9iZSBvcmRlcmluZy4KClNpZ25lZC1vZmYtYnk6IEhlaWtvIFN0 dWVibmVyIDxoZWlrb0BzbnRlY2guZGU+Ci0tLQogZHJpdmVycy9yZWd1bGF0b3IvY29yZS5jICAg fCA1ICsrKy0tCiBkcml2ZXJzL3JlZ3VsYXRvci9kZXZyZXMuYyB8IDUgKysrLS0KIDIgZmlsZXMg Y2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvcmVndWxhdG9yL2NvcmUuYyBiL2RyaXZlcnMvcmVndWxhdG9yL2NvcmUuYwppbmRleCA1 MmFmMWQ3Li4wN2NhNmNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL3JlZ3VsYXRvci9jb3JlLmMKKysr IGIvZHJpdmVycy9yZWd1bGF0b3IvY29yZS5jCkBAIC0zMTYzLDggKzMxNjMsOSBAQCBpbnQgcmVn dWxhdG9yX2J1bGtfZ2V0KHN0cnVjdCBkZXZpY2UgKmRldiwgaW50IG51bV9jb25zdW1lcnMsCiAJ CQkJCQkgICAgICBjb25zdW1lcnNbaV0uc3VwcGx5KTsKIAkJaWYgKElTX0VSUihjb25zdW1lcnNb aV0uY29uc3VtZXIpKSB7CiAJCQlyZXQgPSBQVFJfRVJSKGNvbnN1bWVyc1tpXS5jb25zdW1lcik7 Ci0JCQlkZXZfZXJyKGRldiwgIkZhaWxlZCB0byBnZXQgc3VwcGx5ICclcyc6ICVkXG4iLAotCQkJ CWNvbnN1bWVyc1tpXS5zdXBwbHksIHJldCk7CisJCQlpZiAocmV0ICE9IC1FUFJPQkVfREVGRVIp CisJCQkJZGV2X2VycihkZXYsICJGYWlsZWQgdG8gZ2V0IHN1cHBseSAnJXMnOiAlZFxuIiwKKwkJ CQkJY29uc3VtZXJzW2ldLnN1cHBseSwgcmV0KTsKIAkJCWNvbnN1bWVyc1tpXS5jb25zdW1lciA9 IE5VTEw7CiAJCQlnb3RvIGVycjsKIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9yZWd1bGF0b3Iv ZGV2cmVzLmMgYi9kcml2ZXJzL3JlZ3VsYXRvci9kZXZyZXMuYwppbmRleCA2ZWMxZDQwLi43OGU0 NjBkIDEwMDY0NAotLS0gYS9kcml2ZXJzL3JlZ3VsYXRvci9kZXZyZXMuYworKysgYi9kcml2ZXJz L3JlZ3VsYXRvci9kZXZyZXMuYwpAQCAtMTY4LDggKzE2OCw5IEBAIGludCBkZXZtX3JlZ3VsYXRv cl9idWxrX2dldChzdHJ1Y3QgZGV2aWNlICpkZXYsIGludCBudW1fY29uc3VtZXJzLAogCQkJCQkJ CSAgIGNvbnN1bWVyc1tpXS5zdXBwbHkpOwogCQlpZiAoSVNfRVJSKGNvbnN1bWVyc1tpXS5jb25z dW1lcikpIHsKIAkJCXJldCA9IFBUUl9FUlIoY29uc3VtZXJzW2ldLmNvbnN1bWVyKTsKLQkJCWRl dl9lcnIoZGV2LCAiRmFpbGVkIHRvIGdldCBzdXBwbHkgJyVzJzogJWRcbiIsCi0JCQkJY29uc3Vt ZXJzW2ldLnN1cHBseSwgcmV0KTsKKwkJCWlmIChyZXQgIT0gLUVQUk9CRV9ERUZFUikKKwkJCQlk ZXZfZXJyKGRldiwgIkZhaWxlZCB0byBnZXQgc3VwcGx5ICclcyc6ICVkXG4iLAorCQkJCQljb25z dW1lcnNbaV0uc3VwcGx5LCByZXQpOwogCQkJY29uc3VtZXJzW2ldLmNvbnN1bWVyID0gTlVMTDsK IAkJCWdvdG8gZXJyOwogCQl9Ci0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752225AbbCIXWL (ORCPT ); Mon, 9 Mar 2015 19:22:11 -0400 Received: from gloria.sntech.de ([95.129.55.99]:36829 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751451AbbCIXWI (ORCPT ); Mon, 9 Mar 2015 19:22:08 -0400 From: Heiko Stuebner To: Philipp Zabel , broonie@kernel.org Cc: David Airlie , djkurtz@chromium.org, Yakir Yang , Fabio Estevam , dianders@chromium.org, Andy Yan , Mark Yao , linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] regulator: don't emit errors in {devm_}regulator_bulk_get when defering Date: Tue, 10 Mar 2015 00:22:06 +0100 Message-ID: <9261130.uPvufuEFrr@phil> User-Agent: KMail/4.14.1 (Linux/3.19.0+; KDE/4.14.2; x86_64; ; ) In-Reply-To: <1429128.MSqYm0qZ9p@phil> References: <1429128.MSqYm0qZ9p@phil> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When {devm_}regulator_get returns -EPROBE_DEFER the driver in question will try probing again at a later time. So don't spam the log with failure messages as this is an expected result of probe ordering. Signed-off-by: Heiko Stuebner --- 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 52af1d7..07ca6cb 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3163,8 +3163,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 6ec1d40..78e460d 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; } -- 2.1.4