clk: mvebu: Use of_clk_get_parent_name()
authorStephen Boyd <sboyd@codeaurora.org>
Fri, 16 Oct 2015 23:35:11 +0000 (16:35 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Fri, 16 Oct 2015 23:35:43 +0000 (16:35 -0700)
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>
drivers/clk/mvebu/clk-cpu.c

index 85da8b9832568b2e4daab35eea661d4d99a5ac26..5837eb8a212fbdcd8446ff9da77f393cc05c128a 100644 (file)
@@ -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;