projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'chrome-platform-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
clk
/
mvebu
/
clk-cpu.c
diff --git
a/drivers/clk/mvebu/clk-cpu.c
b/drivers/clk/mvebu/clk-cpu.c
index 85da8b9832568b2e4daab35eea661d4d99a5ac26..5837eb8a212fbdcd8446ff9da77f393cc05c128a 100644
(file)
--- 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;
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;
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);
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;
cpuclk[cpu].clk_name = clk_name;
cpuclk[cpu].cpu = cpu;
cpuclk[cpu].reg_base = clock_complex_base;