[07/21] c6x: use for_each_of_cpu_node iterator

Message ID 20180905193738.19325-8-robh@kernel.org
State Accepted
Commit 5a931a3c80b5fb0ad0004f016410a75ca1205959
Headers show
Series
  • Untitled series #14588
Related show

Commit Message

Rob Herring Sept. 5, 2018, 7:37 p.m.
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: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
Cc: linux-c6x-dev@linux-c6x.org
Signed-off-by: Rob Herring <robh@kernel.org>

---
Please ack and I will take via the DT tree. This is dependent on the
first 2 patches.

 arch/c6x/kernel/setup.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

--
2.17.1

Patch

diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index 786e36e2f61d..2e97455ca0b7 100644
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -96,7 +96,7 @@  static void __init get_cpuinfo(void)
 	unsigned long core_khz;
 	u64 tmp;
 	struct cpuinfo_c6x *p;
-	struct device_node *node, *np;
+	struct device_node *node;

 	p = &per_cpu(cpu_data, smp_processor_id());

@@ -190,13 +190,8 @@  static void __init get_cpuinfo(void)

 	p->core_id = get_coreid();

-	node = of_find_node_by_name(NULL, "cpus");
-	if (node) {
-		for_each_child_of_node(node, np)
-			if (!strcmp("cpu", np->name))
-				++c6x_num_cores;
-		of_node_put(node);
-	}
+	for_each_of_cpu_node(node)
+		++c6x_num_cores;

 	node = of_find_node_by_name(NULL, "soc");
 	if (node) {