From patchwork Tue Apr 10 12:51:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 10333047 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B80476053C for ; Tue, 10 Apr 2018 12:53:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8506288BC for ; Tue, 10 Apr 2018 12:53:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C0F328CED; Tue, 10 Apr 2018 12:53:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C824288BC for ; Tue, 10 Apr 2018 12:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ONfUrqFd1HgxTSSquUJUgzl+rVJNpmFWmtKD+SZM2OM=; b=PPy8r8L+/iPFpHE9OtY1WEX4sS 2tb2+8DL88b3HDFA4dIe72Fp68v7RXbXBnE6f9szZSf0qwDmhNGX7ipj8qMAsfVRFw9Kp9x3F0e0c v8o3D3ggVswyo2c9vZ++Ag8ae6WxVk5H65MNDz/B/Fj4ybqGo4Q2hwUBelSLF7iMZiLoAgjosjKa2 TUfCXK5KCltWUOYwngD8kWppkEkOt6RnsAVAYUgxx+b7CP5OKHAIS9NlhJdLpM8Un8cqxuRM1AIMz 3QSuGgsz1odBoSb3IanaBB1lXAv9Nfs7MTvMxkTKf9NN4u/sAq/dCHHHfmCzugH8rQXCagnISKurL r2y3fCyg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f5slw-0003pf-N6; Tue, 10 Apr 2018 12:53:16 +0000 Received: from michel.telenet-ops.be ([2a02:1800:110:4::f00:18]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f5skt-00032h-AC for linux-rockchip@lists.infradead.org; Tue, 10 Apr 2018 12:52:15 +0000 Received: from ayla.of.borg ([84.194.111.163]) by michel.telenet-ops.be with bizsmtp id Ycrj1x00T3XaVaC06crj6E; Tue, 10 Apr 2018 14:51:54 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.86_2) (envelope-from ) id 1f5skR-00054U-Oo; Tue, 10 Apr 2018 14:51:43 +0200 Received: from geert by ramsan with local (Exim 4.86_2) (envelope-from ) id 1f5skR-00041A-Nq; Tue, 10 Apr 2018 14:51:43 +0200 From: Geert Uytterhoeven To: Michael Turquette , Stephen Boyd Subject: [PATCH v2 3/5] soc: rockchip: power-domain: Use of_clk_get_parent_count() instead of open coding Date: Tue, 10 Apr 2018 14:51:39 +0200 Message-Id: <1523364701-15383-4-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523364701-15383-1-git-send-email-geert+renesas@glider.be> References: <1523364701-15383-1-git-send-email-geert+renesas@glider.be> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180410_055211_582130_936B2561 X-CRM114-Status: GOOD ( 12.24 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Heiko Stuebner , Geert Uytterhoeven , linux-rockchip@lists.infradead.org, Maxime Ripard , Linus Walleij , Daniel Lezcano , linux-kernel@vger.kernel.org, Jonathan Hunter , linux-gpio@vger.kernel.org, Chen-Yu Tsai , Rob Herring , Thierry Reding , linux-tegra@vger.kernel.org, Thomas Gleixner , Frank Rowand , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP As of_clk_get_parent_count() returns zero on failure, while of_count_phandle_with_args() might return a negative error code, this also fixes the issue of possibly using a negative number in the allocation below. Signed-off-by: Geert Uytterhoeven Reviewed-by: Heiko Stuebner --- This depends on "[PATCH v2 1/5] clk: Extract OF clock helpers in ". v2: - of_clk_get_parent_count() was moved to . --- drivers/soc/rockchip/pm_domains.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 53efc386b1ada8cf..13913d40c8213e36 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -400,8 +401,7 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu, pd->info = pd_info; pd->pmu = pmu; - pd->num_clks = of_count_phandle_with_args(node, "clocks", - "#clock-cells"); + pd->num_clks = of_clk_get_parent_count(node); if (pd->num_clks > 0) { pd->clks = devm_kcalloc(pmu->dev, pd->num_clks, sizeof(*pd->clks), GFP_KERNEL);