Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754549AbbBZXk0 (ORCPT ); Thu, 26 Feb 2015 18:40:26 -0500 Received: from seldrel01.sonyericsson.com ([212.209.106.2]:14927 "EHLO seldrel01.sonyericsson.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751718AbbBZXkY (ORCPT ); Thu, 26 Feb 2015 18:40:24 -0500 From: Bjorn Andersson To: Liam Girdwood , Mark Brown CC: Subject: [PATCH] regulator: core: Silence EPROBE_DEFER error on bulk_get Date: Thu, 26 Feb 2015 15:40:20 -0800 Message-ID: <1424994020-6698-1-git-send-email-bjorn.andersson@sonymobile.com> X-Mailer: git-send-email 1.8.2.2 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1903 Lines: 53 As this is already being logged elsewhere we shouldn't spam the log unnecessarily upon EPROBE_DEFER. Signed-off-by: Bjorn Andersson --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/