From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751453AbeAEAku (ORCPT + 1 other); Thu, 4 Jan 2018 19:40:50 -0500 Received: from vern.gendns.com ([206.190.152.46]:37659 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397AbeAEAko (ORCPT ); Thu, 4 Jan 2018 19:40:44 -0500 From: David Lechner To: linux-clk@vger.kernel.org Cc: David Lechner , Michael Turquette , Stephen Boyd , Matthias Brugger , Heiko Stuebner , =?UTF-8?q?Emilio=20L=C3=B3pez?= , Maxime Ripard , Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 3/7] clk: qoriq: make use of clk_alloc_onecell_data() Date: Thu, 4 Jan 2018 18:38:08 -0600 Message-Id: <1515112695-3160-4-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515112695-3160-1-git-send-email-david@lechnology.com> References: <1515112695-3160-1-git-send-email-david@lechnology.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Use helper function clk_alloc_onecell_data() to allocate struct clk_onecell_data. Signed-off-by: David Lechner --- drivers/clk/clk-qoriq.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c index 3a1812f..5278cc7 100644 --- a/drivers/clk/clk-qoriq.c +++ b/drivers/clk/clk-qoriq.c @@ -1175,13 +1175,11 @@ static void __init legacy_pll_init(struct device_node *np, int idx) count = of_property_count_strings(np, "clock-output-names"); BUILD_BUG_ON(ARRAY_SIZE(pll->div) < 4); - subclks = kcalloc(4, sizeof(struct clk *), GFP_KERNEL); - if (!subclks) + onecell_data = clk_alloc_onecell_data(4); + if (!onecell_data) return; - onecell_data = kmalloc(sizeof(*onecell_data), GFP_KERNEL); - if (!onecell_data) - goto err_clks; + subclks = onecell_data->clks; if (count <= 3) { subclks[0] = pll->div[0].clk; @@ -1194,7 +1192,6 @@ static void __init legacy_pll_init(struct device_node *np, int idx) subclks[3] = pll->div[3].clk; } - onecell_data->clks = subclks; onecell_data->clk_num = count; rc = of_clk_add_provider(np, of_clk_src_onecell_get, onecell_data); @@ -1206,9 +1203,7 @@ static void __init legacy_pll_init(struct device_node *np, int idx) return; err_cell: - kfree(onecell_data); -err_clks: - kfree(subclks); + clk_free_onecell_data(onecell_data); } /* Legacy node */ -- 2.7.4