From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753747Ab2LQVCX (ORCPT ); Mon, 17 Dec 2012 16:02:23 -0500 Received: from wolverine01.qualcomm.com ([199.106.114.254]:17738 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753413Ab2LQVCT (ORCPT ); Mon, 17 Dec 2012 16:02:19 -0500 X-IronPort-AV: E=Sophos;i="4.84,304,1355126400"; d="scan'208";a="14662750" From: Stephen Boyd To: Mike Turquette Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Rob Herring Subject: [PATCH 2/4] clk: highbank: Use of_init_clk_data() Date: Mon, 17 Dec 2012 13:02:13 -0800 Message-Id: <1355778135-32458-3-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 1.8.1.rc1 In-Reply-To: <1355778135-32458-1-git-send-email-sboyd@codeaurora.org> References: <1355778135-32458-1-git-send-email-sboyd@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reduce lines of code and simplify this driver by using the generic clock binding parsing function. Signed-off-by: Stephen Boyd Cc: Rob Herring --- drivers/clk/clk-highbank.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/clk/clk-highbank.c b/drivers/clk/clk-highbank.c index 52fecad..5dbbf62 100644 --- a/drivers/clk/clk-highbank.c +++ b/drivers/clk/clk-highbank.c @@ -275,8 +275,6 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk u32 reg; struct clk *clk; struct hb_clk *hb_clk; - const char *clk_name = node->name; - const char *parent_name; struct clk_init_data init; int rc; @@ -290,24 +288,21 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk hb_clk->reg = sregs_base + reg; - of_property_read_string(node, "clock-output-names", &clk_name); - - init.name = clk_name; init.ops = ops; - init.flags = 0; - parent_name = of_clk_get_parent_name(node, 0); - init.parent_names = &parent_name; - init.num_parents = 1; + rc = of_init_clk_data(node, &init); + if (WARN_ON(rc)) + goto err; hb_clk->hw.init = &init; clk = clk_register(NULL, &hb_clk->hw); - if (WARN_ON(IS_ERR(clk))) { - kfree(hb_clk); - return NULL; - } + if (WARN_ON(IS_ERR(clk))) + goto err; rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); return clk; +err: + kfree(hb_clk); + return NULL; } static void __init hb_pll_init(struct device_node *node) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation