summaryrefslogtreecommitdiffstats
path: root/drivers/clk/mvebu
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-10-16 16:35:11 -0700
committerStephen Boyd <sboyd@codeaurora.org>2015-10-16 16:35:43 -0700
commit61e22fff6475448b8e9d3e45f0bab40bae761c96 (patch)
treec0a21d7f37cfdf0d3b927136bc285e2deaf77476 /drivers/clk/mvebu
parent5532cfb567fec4ebb9775481ef121edb340ec5b8 (diff)
downloadop-kernel-dev-61e22fff6475448b8e9d3e45f0bab40bae761c96.zip
op-kernel-dev-61e22fff6475448b8e9d3e45f0bab40bae761c96.tar.gz
clk: mvebu: Use of_clk_get_parent_name()
This reverts commit e79b202c632f24f49f2eb9459b88b5fd9e332263. Now that we use of_clk_get() inside of_clk_get_parent_name() we can safely use it here. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/mvebu')
-rw-r--r--drivers/clk/mvebu/clk-cpu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index 85da8b9..5837eb8 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -197,7 +197,6 @@ static void __init of_cpu_clk_setup(struct device_node *node)
for_each_node_by_type(dn, "cpu") {
struct clk_init_data init;
struct clk *clk;
- struct clk *parent_clk;
char *clk_name = kzalloc(5, GFP_KERNEL);
int cpu, err;
@@ -209,9 +208,8 @@ static void __init of_cpu_clk_setup(struct device_node *node)
goto bail_out;
sprintf(clk_name, "cpu%d", cpu);
- parent_clk = of_clk_get(node, 0);
- cpuclk[cpu].parent_name = __clk_get_name(parent_clk);
+ cpuclk[cpu].parent_name = of_clk_get_parent_name(node, 0);
cpuclk[cpu].clk_name = clk_name;
cpuclk[cpu].cpu = cpu;
cpuclk[cpu].reg_base = clock_complex_base;
OpenPOWER on IntegriCloud