From patchwork Tue Mar 22 17:58:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 8644531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 590DA9F44D for ; Tue, 22 Mar 2016 18:01:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67C67202FE for ; Tue, 22 Mar 2016 18:01:14 +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 3508C20396 for ; Tue, 22 Mar 2016 18:01:13 +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 1aiQak-00066L-OE; Tue, 22 Mar 2016 17:59:42 +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 1aiQa9-0005hz-7c for linux-arm-kernel@lists.infradead.org; Tue, 22 Mar 2016 17:59:07 +0000 Received: by theia.8bytes.org (Postfix, from userid 1000) id B313470C8; Tue, 22 Mar 2016 18:58:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1458669515; bh=SvJvd4s9ZXG+rAgMZOW0Q2Y9Nn0QbwTW3UmfIYnc/fA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pbbsbpt0dICBXr2Jxx+xeBBEYIDbPqic6owTkGEvcXYxCyFo8yl6ZmS/Bp2qS8qYx wDipWW7lcbdGqgp4XhTCutQS5upj2CKxa9ahHCTOjKF3PyAKQjzyZZW7t0jEbefm1i YcUFo3TNfxaE9iOh1qH6itSXsgRzeSHAg6VkWkfJWZaaGXCWw3RlScv3TfK1qbQbBs SkHSx8RFWRhNB5HjMcoK89r7NTQic2R6tMXk5kkU33e/X0BdPXxLUFPTNdFlZ4Wflm 5/PkhO+qin1ZgqZzOStkZl1nVz+X1AJJWgd6AWXd+Vm14Vi5CUskfTO3sqrZBuaMZE pNAUlpXxplPBA== 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: Tue, 22 Mar 2016 18:58:26 +0100 Message-Id: <1458669509-7178-4-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458669509-7178-1-git-send-email-joro@8bytes.org> References: <1458669509-7178-1-git-send-email-joro@8bytes.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160322_105905_550346_DD747040 X-CRM114-Status: GOOD ( 12.87 ) X-Spam-Score: -2.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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 --- 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 4036512..15593cd 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1583,10 +1583,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) @@ -1722,8 +1719,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);