Skip to content

Commit

Permalink
clk: mvebu: Use of_clk_get_parent_name()
Browse files Browse the repository at this point in the history
This reverts commit e79b202.

Now that we use of_clk_get() inside of_clk_get_parent_name() we
can safely use it here.

Signed-off-by: Stephen Boyd <[email protected]>
  • Loading branch information
bebarino committed Oct 16, 2015
1 parent 5532cfb commit 61e22ff
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/clk/mvebu/clk-cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down

0 comments on commit 61e22ff

Please sign in to comment.