From patchwork Mon Apr 4 15:49:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 8742111 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6D3E3C0553 for ; Mon, 4 Apr 2016 15:52:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A73A20204 for ; Mon, 4 Apr 2016 15:52:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BE108200DB for ; Mon, 4 Apr 2016 15:52:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1an6mb-0006hC-9t; Mon, 04 Apr 2016 15:51:17 +0000 Received: from 8bytes.org ([2a01:238:4383:600:38bc:a715:4b6d:a889] helo=theia.8bytes.org) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1an6ld-0004ZY-Fg for linux-arm-kernel@lists.infradead.org; Mon, 04 Apr 2016 15:50:19 +0000 Received: by theia.8bytes.org (Postfix, from userid 1000) id 6625812F4; Mon, 4 Apr 2016 17:49:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1459784964; bh=Oq5eIhnr5FWGcXnYvwGDP5L+nWILtYgHGPb+8pQ2NT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JG5pVGsW/Z7qCl93Jdbdl1+LJV7mX7M9hgDdf1IbqbtpH80ks8LY8b7+5fqwy3g9c VujBdU3Tf8hE/X/qzYFdLfw+2lP0VmtVjuwgNFkfBdwsncCAXSrXHVYrq+RAD4AniH bVJLBmzN1W4FZjjugcsXGRnQrqZAbCN6qi4tbUmabSMv7TlShid2+uKPZk9pM8F9RN snlkeAlZfPuTzxkbE5em+NpwIEjBeyB/ntXyWdFUcCYEvyTIfTIhaign6HzPGPXfTd hjLwK7rZuNbEy4F9vIGkxcvoQEd4f2kqVQVzGLBiXOTHAfFnNzbj94VOCHYuTtSQeK opFl0P4azHwfw== From: Joerg Roedel To: Rob Herring , grant.likely@linaro.org Subject: [PATCH 3/6] of: Remove counting special case from __of_parse_phandle_with_args() Date: Mon, 4 Apr 2016 17:49:19 +0200 Message-Id: <1459784962-9808-4-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459784962-9808-1-git-send-email-joro@8bytes.org> References: <1459784962-9808-1-git-send-email-joro@8bytes.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160404_085018_054364_D7B051C4 X-CRM114-Status: GOOD ( 12.97 ) X-Spam-Score: -3.0 (---) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, jroedel@suse.de, Will Deacon , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org 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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Joerg Roedel The index = -1 case in __of_parse_phandle_with_args() is used to just return the number of phandles. That special case needs extra handling, so move it to the place where it is needed: of_count_phandle_with_args(). This allows to further simplify __of_parse_phandle_with_args() later on. Signed-off-by: Joerg Roedel Acked-by: Rob Herring --- drivers/of/base.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 69286ec..fcff2b6 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1584,10 +1584,7 @@ static int __of_parse_phandle_with_args(const struct device_node *np, * Unlock node before returning result; will be one of: * -ENOENT : index is for empty phandle * -EINVAL : parsing error on data - * [1..n] : Number of phandle (count mode; when index = -1) */ - if (rc == -ENOENT && index < 0) - rc = cur_index; err: if (it.node) @@ -1723,8 +1720,20 @@ EXPORT_SYMBOL(of_parse_phandle_with_fixed_args); int of_count_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name) { - return __of_parse_phandle_with_args(np, list_name, cells_name, 0, -1, - NULL); + struct of_phandle_iterator it; + int rc, cur_index = 0; + + rc = of_phandle_iterator_init(&it, np, list_name, cells_name, 0); + if (rc) + return rc; + + while ((rc = of_phandle_iterator_next(&it)) == 0) + cur_index += 1; + + if (rc != -ENOENT) + return rc; + + return cur_index; } EXPORT_SYMBOL(of_count_phandle_with_args);