Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux.git] / drivers / of / of_numa.c

diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
index 27d9b4bba535c21181324d6652129f84ff174083..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)
@@ -163,8 +152,8 @@ int of_node_to_nid(struct device_node *device)
                np = of_get_next_parent(np);
        }
        if (np && r)
-               pr_warn("Invalid \"numa-node-id\" property in node %s\n",
-                       np->name);
+               pr_warn("Invalid \"numa-node-id\" property in node %pOFn\n",
+                       np);
        of_node_put(np);
 
        /*