From patchwork Thu Dec 12 13:31:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 3331881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 52B20C0D4A for ; Thu, 12 Dec 2013 13:32:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B787B20795 for ; Thu, 12 Dec 2013 13:32:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 058F520640 for ; Thu, 12 Dec 2013 13:31:56 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr6Mo-0006Rs-1w; Thu, 12 Dec 2013 13:31:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr6Ml-0004Gt-L5; Thu, 12 Dec 2013 13:31:47 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr6Mj-0004GA-9v for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 13:31:46 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBCDVJKA003322 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 12 Dec 2013 08:31:19 -0500 Received: from shalem.localdomain.com (vpn1-7-207.ams2.redhat.com [10.36.7.207]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rBCDVHli005846; Thu, 12 Dec 2013 08:31:17 -0500 From: Hans de Goede To: Mark Brown Subject: [PATCH v2] regulator_get_optional: don't print an error when no regulator is found Date: Thu, 12 Dec 2013 14:31:16 +0100 Message-Id: <1386855076-5242-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131212_083145_499590_AF456343 X-CRM114-Status: GOOD ( 10.99 ) X-Spam-Score: -6.9 (------) Cc: Hans de Goede , Liam Girdwood , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since regulator_get_optional is the only one calling _regulator_get() with both allow_dummy and exclusive set to false this patch adds the following test for calling dev_err: if (!(!allow_dummy && !exclusive)) Simplified to the much easier on the eyes: if (allow_dummy || exclusive) Signed-off-by: Hans de Goede --- drivers/regulator/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 3fe1313..a1d4ddc 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1346,7 +1346,8 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, rdev = dummy_regulator_rdev; goto found; - } else { + /* Don't log an error when called from regulator_get_optional() */ + } else if (allow_dummy || exclusive) { dev_err(dev, "dummy supplies not allowed\n"); }