From 059a1aa7eb1de2ccbc41a708e892c080d9e26c60 Mon Sep 17 00:00:00 2001 From: Stephen Boyd <sboyd@codeaurora.org> Date: Fri, 19 Jun 2015 15:00:46 -0700 Subject: clk: keystone: Remove clk.h include Clock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver. Cc: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Cc: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/clk/keystone/gate.c | 1 - drivers/clk/keystone/pll.c | 1 - 2 files changed, 2 deletions(-) (limited to 'drivers/clk/keystone') diff --git a/drivers/clk/keystone/gate.c b/drivers/clk/keystone/gate.c index 86f1e362eafb..aed5af23895b 100644 --- a/drivers/clk/keystone/gate.c +++ b/drivers/clk/keystone/gate.c @@ -10,7 +10,6 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/io.h> diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c index 4a375ead70e9..25443e4d139f 100644 --- a/drivers/clk/keystone/pll.c +++ b/drivers/clk/keystone/pll.c @@ -10,7 +10,6 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/io.h> -- cgit v1.2.3 From 5f23eff7af6bc1d8cc8e17fc12e8d989042236ed Mon Sep 17 00:00:00 2001 From: Dinh Nguyen <dinguyen@opensource.altera.com> Date: Mon, 6 Jul 2015 22:59:03 -0500 Subject: clk: keystone: make use of of_clk_parent_fill helper function Use of_clk_parent_fill to fill in the parent clock names' array. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/clk/keystone/pll.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/clk/keystone') diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c index 4a375ead70e9..d6ef063dae7e 100644 --- a/drivers/clk/keystone/pll.c +++ b/drivers/clk/keystone/pll.c @@ -309,8 +309,7 @@ static void __init of_pll_mux_clk_init(struct device_node *node) return; } - parents[0] = of_clk_get_parent_name(node, 0); - parents[1] = of_clk_get_parent_name(node, 1); + of_clk_parent_fill(node, parents, 2); if (!parents[0] || !parents[1]) { pr_err("%s: missing parent clocks\n", __func__); return; -- cgit v1.2.3