1 files changed, 7 insertions, 21 deletions

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 733288967d4d..200926699778 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -122,17 +122,8 @@ EXPORT_SYMBOL_GPL(cci_ace_get_port);
 
 static void __init cci_ace_init_ports(void)
 {
-        int port, ac, cpu;
-        u64 hwid;
-        const u32 *cell;
-        struct device_node *cpun, *cpus;
-
-        cpus = of_find_node_by_path("/cpus");
-        if (WARN(!cpus, "Missing cpus node, bailing out\n"))
-                return;
-
-        if (WARN_ON(of_property_read_u32(cpus, "#address-cells", &ac)))
-                ac = of_n_addr_cells(cpus);
+        int port, cpu;
+        struct device_node *cpun;
 
         /*
          * Port index look-up speeds up the function disabling ports by CPU,
@@ -141,18 +132,13 @@ static void __init cci_ace_init_ports(void)
          * The stashed index array is initialized for all possible CPUs
          * at probe time.
          */
-        for_each_child_of_node(cpus, cpun) {
-                if (of_node_cmp(cpun->type, "cpu"))
-                        continue;
-                cell = of_get_property(cpun, "reg", NULL);
-                if (WARN(!cell, "%s: missing reg property\n", cpun->full_name))
-                        continue;
-
-                hwid = of_read_number(cell, ac);
-                cpu = get_logical_index(hwid & MPIDR_HWID_BITMASK);
+        for_each_possible_cpu(cpu) {
+                /* too early to use cpu->of_node */
+                cpun = of_get_cpu_node(cpu, NULL);
 
-                if (cpu < 0 || !cpu_possible(cpu))
+                if (WARN(!cpun, "Missing cpu device node\n"))
                         continue;
+
                 port = __cci_ace_get_port(cpun, ACE_PORT);
                 if (port < 0)
                         continue;