of: use for_each_of_cpu_node iterator

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This
has the side effect of defaulting to iterating using "cpu" node names in
preference to the deprecated (for FDT) device_type == "cpu".

Cc: Frank Rowand <frowand.list@gmail.com>
Cc: devicetree@vger.kernel.org
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/base.c b/drivers/of/base.c
index bd51d2113cc05987f3f6098ecdfbd86596f5ee51..5fd6eee99015ec32fa6d1fdd2fea06907fb5215c 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -389,7 +389,7 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 {
        struct device_node *cpun;
 
-       for_each_node_by_type(cpun, "cpu") {
+       for_each_of_cpu_node(cpun) {
                if (arch_find_n_match_cpu_physical_id(cpun, cpu, thread))
                        return cpun;
        }

diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
index 67d3386195bfac55813b7c6fb0ea6db91639a857..35c64a4295e07edc9b5f59ebaed18d3ab2ef1c52 100644 (file)
--- a/drivers/of/of_numa.c
+++ b/drivers/of/of_numa.c
@@ -24,18 +24,9 @@ static void __init of_numa_parse_cpu_nodes(void)
 {
        u32 nid;
        int r;
-       struct device_node *cpus;
-       struct device_node *np = NULL;
-
-       cpus = of_find_node_by_path("/cpus");
-       if (!cpus)
-               return;
-
-       for_each_child_of_node(cpus, np) {
-               /* Skip things that are not CPUs */
-               if (of_node_cmp(np->type, "cpu") != 0)
-                       continue;
+       struct device_node *np;
 
+       for_each_of_cpu_node(np) {
                r = of_property_read_u32(np, "numa-node-id", &nid);
                if (r)
                        continue;
@@ -46,8 +37,6 @@ static void __init of_numa_parse_cpu_nodes(void)
                else
                        node_set(nid, numa_nodes_parsed);
        }
-
-       of_node_put(cpus);
 }
 
 static int __init of_numa_parse_memory_nodes(void)