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

Commit 9625e69a authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Michael Ellerman
Browse files

powerpc: make use of for_each_node_by_type() instead of open-coding it 



Instead of manually coding the loop with of_find_node_by_type(), let's
switch to the standard macro for iterating over nodes with given type.

Also fixed a couple of refcount leaks in the aforementioned loops.

Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 94d3084a

arch/powerpc/kernel/setup-common.c

+7 −2
Original line number Diff line number Diff line
@@ -470,13 +470,13 @@ static void __init cpu_init_thread_core_maps(int tpc) 
 */

void __init smp_setup_cpu_maps(void)

{

	struct device_node *dn = NULL;

	struct device_node *dn;

	int cpu = 0;

	int nthreads = 1;



	DBG("smp_setup_cpu_maps()\n");



	while ((dn = of_find_node_by_type(dn, "cpu")) && cpu < nr_cpu_ids) {

	for_each_node_by_type(dn, "cpu") {

		const __be32 *intserv;

		__be32 cpu_be;

		int j, len;
@@ -516,6 +516,11 @@ void __init smp_setup_cpu_maps(void) 
			set_cpu_possible(cpu, true);

			cpu++;

		}



		if (cpu >= nr_cpu_ids) {

			of_node_put(dn);

			break;

		}

	}



	/* If no SMT supported, nthreads is forced to 1 */

arch/powerpc/platforms/cell/spu_manage.c

+2 −2
Original line number Diff line number Diff line
@@ -292,12 +292,12 @@ static int __init of_enumerate_spus(int (*fn)(void *data)) 
	unsigned int n = 0;



	ret = -ENODEV;

	for (node = of_find_node_by_type(NULL, "spe");

			node; node = of_find_node_by_type(node, "spe")) {

	for_each_node_by_type(node, "spe") {

		ret = fn(node);

		if (ret) {

			printk(KERN_WARNING "%s: Error initializing %s\n",

				__func__, node->name);

			of_node_put(node);

			break;

		}

		n++;

arch/powerpc/platforms/powermac/pic.c

+4 −3
Original line number Diff line number Diff line
@@ -486,16 +486,17 @@ static int __init pmac_pic_probe_mpic(void) 
	struct device_node *np, *master = NULL, *slave = NULL;



	/* We can have up to 2 MPICs cascaded */

	for (np = NULL; (np = of_find_node_by_type(np, "open-pic"))

		     != NULL;) {

	for_each_node_by_type(np, "open-pic") {

		if (master == NULL &&

		    of_get_property(np, "interrupts", NULL) == NULL)

			master = of_node_get(np);

		else if (slave == NULL)

			slave = of_node_get(np);

		if (master && slave)

		if (master && slave) {

			of_node_put(np);

			break;

		}

	}



	/* Check for bogus setups */

	if (master == NULL && slave != NULL) {

arch/powerpc/platforms/powermac/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static void __init smp_core99_probe(void) 
	if (ppc_md.progress) ppc_md.progress("smp_core99_probe", 0x345);



	/* Count CPUs in the device-tree */

       	for (cpus = NULL; (cpus = of_find_node_by_type(cpus, "cpu")) != NULL;)

	for_each_node_by_type(cpus, "cpu")

		++ncpus;



	printk(KERN_INFO "PowerMac SMP probe found %d cpus\n", ncpus);

arch/powerpc/platforms/pseries/lparcfg.c

+2 −2
Original line number Diff line number Diff line
@@ -370,10 +370,10 @@ static void parse_system_parameter_string(struct seq_file *m) 
 */

static int lparcfg_count_active_processors(void)

{

	struct device_node *cpus_dn = NULL;

	struct device_node *cpus_dn;

	int count = 0;



	while ((cpus_dn = of_find_node_by_type(cpus_dn, "cpu"))) {

	for_each_node_by_type(cpus_dn, "cpu") {

#ifdef LPARCFG_DEBUG

		printk(KERN_ERR "cpus_dn %p\n", cpus_dn);

#endif