From patchwork Thu Dec 27 12:10:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Larsson X-Patchwork-Id: 1912751 Return-Path: X-Original-To: patchwork-spi-devel-general@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by patchwork2.kernel.org (Postfix) with ESMTP id D9B5CDF2A2 for ; Thu, 27 Dec 2012 12:11:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ToCJ2-0007xF-Mt; Thu, 27 Dec 2012 12:11:24 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ToCJ1-0007x8-BD for spi-devel-general@lists.sourceforge.net; Thu, 27 Dec 2012 12:11:23 +0000 X-ACL-Warn: Received: from vsp-authed02.binero.net ([195.74.38.226] helo=vsp-authed-03-02.binero.net) by sog-mx-2.v43.ch3.sourceforge.com with smtp (Exim 4.76) id 1ToCJ0-0003ko-CL for spi-devel-general@lists.sourceforge.net; Thu, 27 Dec 2012 12:11:23 +0000 Received: from smtp01.binero.se (unknown [195.74.38.28]) by vsp-authed-03-02.binero.net (Halon Mail Gateway) with ESMTP; Thu, 27 Dec 2012 13:11:07 +0100 (CET) Received: from localhost.localdomain (static-92-33-28-242.sme.bredbandsbolaget.se [92.33.28.242]) (Authenticated sender: andreas@gaisler.com) by smtp-08-01.atm.binero.net (Postfix) with ESMTPA id 5F7493A107; Thu, 27 Dec 2012 13:11:07 +0100 (CET) From: Andreas Larsson To: Grant Likely Subject: [PATCH 1/6] of: Return -EEXIST from of_parse_phandle_with_args for holes in phandle list Date: Thu, 27 Dec 2012 13:10:42 +0100 Message-Id: <1356610247-11491-2-git-send-email-andreas@gaisler.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1356610247-11491-1-git-send-email-andreas@gaisler.com> References: <1356610247-11491-1-git-send-email-andreas@gaisler.com> X-Spam-Score: 0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [195.74.38.226 listed in list.dnswl.org] X-Headers-End: 1ToCJ0-0003ko-CL Cc: software@gaisler.com, Linus Walleij , linux-kernel@vger.kernel.org, Rob Herring , spi-devel-general@lists.sourceforge.net, devicetree-discuss@lists.ozlabs.org X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: spi-devel-general-bounces@lists.sourceforge.net Return value for an empty phandle was -EEXIST before commit 15c9a0ac, that changed the return value in this case to -ENOENT. However, of_gpio_named_count relies upon the return value to be -EEXIST and relies upon being able to distinguish this case from the case of no list at all which also returns -ENOENT. Also change the of selftest to expect -EEXIST in this case. Signed-off-by: Andreas Larsson --- I have not run-tested the selftest, not having appropriate hardware around for that. drivers/of/base.c | 4 ++-- drivers/of/selftest.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 2390ddb..986afd7 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1083,11 +1083,11 @@ int of_parse_phandle_with_args(const struct device_node *np, const char *list_na * All of the error cases above bail out of the loop, so at * this point, the parsing is successful. If the requested * index matches, then fill the out_args structure and return, - * or return -ENOENT for an empty entry. + * or return -EEXIST for an empty entry. */ if (cur_index == index) { if (!phandle) - return -ENOENT; + return -EEXIST; if (out_args) { int i; diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c index f24ffd7..b1c2ae9 100644 --- a/drivers/of/selftest.c +++ b/drivers/of/selftest.c @@ -54,7 +54,7 @@ static void __init of_selftest_parse_phandle_with_args(void) passed &= (args.args[1] == 0); break; case 2: - passed &= (rc == -ENOENT); + passed &= (rc == -EEXIST); break; case 3: passed &= !rc;