Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 651d44f9 authored by Rob Herring's avatar Rob Herring
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent a9a455e8

drivers/of/base.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/of/of_numa.c

+2 −13
Original line number Diff line number Diff line
@@ -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)