cpufreq: maple-cpufreq: remove device tree parsing for cpu nodes

Now that the cpu device registration initialises the of_node(if available)
appropriately for all the cpus, parsing here is redundant.

This patch removes all DT parsing and uses cpu->of_node instead.

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
This commit is contained in:
Sudeep KarkadaNagesha 2013-07-17 12:39:29 +01:00
parent da0eb143db
commit 2421d4c34d
1 changed files with 3 additions and 20 deletions

View File

@ -24,7 +24,7 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/of.h> #include <linux/of_device.h>
#define DBG(fmt...) pr_debug(fmt) #define DBG(fmt...) pr_debug(fmt)
@ -201,7 +201,6 @@ static struct cpufreq_driver maple_cpufreq_driver = {
static int __init maple_cpufreq_init(void) static int __init maple_cpufreq_init(void)
{ {
struct device_node *cpus;
struct device_node *cpunode; struct device_node *cpunode;
unsigned int psize; unsigned int psize;
unsigned long max_freq; unsigned long max_freq;
@ -217,24 +216,11 @@ static int __init maple_cpufreq_init(void)
!of_machine_is_compatible("Momentum,Apache")) !of_machine_is_compatible("Momentum,Apache"))
return 0; return 0;
cpus = of_find_node_by_path("/cpus");
if (cpus == NULL) {
DBG("No /cpus node !\n");
return -ENODEV;
}
/* Get first CPU node */ /* Get first CPU node */
for (cpunode = NULL; cpunode = of_cpu_device_node_get(0);
(cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
const u32 *reg = of_get_property(cpunode, "reg", NULL);
if (reg == NULL || (*reg) != 0)
continue;
if (!strcmp(cpunode->type, "cpu"))
break;
}
if (cpunode == NULL) { if (cpunode == NULL) {
printk(KERN_ERR "cpufreq: Can't find any CPU 0 node\n"); printk(KERN_ERR "cpufreq: Can't find any CPU 0 node\n");
goto bail_cpus; goto bail_noprops;
} }
/* Check 970FX for now */ /* Check 970FX for now */
@ -290,14 +276,11 @@ static int __init maple_cpufreq_init(void)
rc = cpufreq_register_driver(&maple_cpufreq_driver); rc = cpufreq_register_driver(&maple_cpufreq_driver);
of_node_put(cpunode); of_node_put(cpunode);
of_node_put(cpus);
return rc; return rc;
bail_noprops: bail_noprops:
of_node_put(cpunode); of_node_put(cpunode);
bail_cpus:
of_node_put(cpus);
return rc; return rc;
} }