powerpc: make use of for_each_node_by_name() instead of open-coding it
Subsystems (4)
PATCH 1/2 powerpc: make use of for_each_node_by_name() instead of open-coding it
Instead of manually coding the loop with of_find_node_by_name(), let's switch to the standard macro for iterating over nodes with given name.
--- arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 3 +-- arch/powerpc/platforms/cell/setup.c | 3 +-- arch/powerpc/platforms/cell/spider-pic.c | 3 +-- arch/powerpc/platforms/powermac/feature.c | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-)
arch/powerpc/platforms/83xx/mpc832x_mds.c +1 -1
@@ -75,7 +75,7 @@ static void __init mpc832x_sys_setup_arch(void)par_io_init (np);of_node_put (np); -for (np =NULL ; (np =of_find_node_by_name (np,"ucc" )) !=NULL ;) + for_each_node_by_name(np. "ucc")par_io_of_config (np); }
arch/powerpc/platforms/83xx/mpc832x_rdb.c +1 -1
@@ -204,7 +204,7 @@ static void __init mpc832x_rdb_setup_arch(void)par_io_init (np);of_node_put (np); -for (np =NULL ; (np =of_find_node_by_name (np,"ucc" )) !=NULL ;) +for_each_node_by_name (np,"ucc" ) par_io_of_config(np); }#endif /* CONFIG_QUICC_ENGINE */
arch/powerpc/platforms/83xx/mpc836x_mds.c +1 -1
@@ -83,7 +83,7 @@ static void __init mpc836x_mds_setup_arch(void)par_io_init (np);of_node_put (np); -for (np =NULL ; (np =of_find_node_by_name (np,"ucc" )) !=NULL ;) +for_each_node_by_name (np,"ucc" )par_io_of_config (np);#ifdef CONFIG_QE_USB /* Must fixup Par IO before QE GPIO chips are registered. */
arch/powerpc/platforms/cell/interrupt.c +1 -2
@@ -315,8 +315,7 @@ static int __init setup_iic(void)struct cbe_iic_regs __iomem *node_iic;const u32 *np; -for (dn =NULL ; - (dn =of_find_node_by_name (dn,"interrupt-controller" )) !=NULL ;) { +for_each_node_by_name (dn,"interrupt-controller" ) {if (!of_device_is_compatible (dn,"IBM,CBEA-Internal-Interrupt-Controller" ))continue ;
arch/powerpc/platforms/cell/setup.c +1 -2
@@ -192,8 +192,7 @@ static void __init mpic_init_IRQ(void)struct device_node *dn;struct mpic *mpic; -for (dn =NULL ; - (dn =of_find_node_by_name (dn,"interrupt-controller" ));) { +for_each_node_by_name (dn,"interrupt-controller" ) {if (!of_device_is_compatible (dn,"CBEA,platform-open-pic" ))continue ;
arch/powerpc/platforms/cell/spider-pic.c +1 -2
@@ -343,8 +343,7 @@ void __init spider_init_IRQ(void)* device-tree is bogus anyway) so all we can do is pray or maybe test * the address and deduce the node-id */ -for (dn =NULL ; - (dn =of_find_node_by_name (dn,"interrupt-controller" ));) { +for_each_node_by_name (dn,"interrupt-controller" ) {if (of_device_is_compatible (dn,"CBEA,platform-spider-pic" )) {if (of_address_to_resource (dn,0 , &r)) {printk (KERN_WARNING "spider-pic: Failed\n" );
arch/powerpc/platforms/powermac/feature.c +1 -1
@@ -2641,7 +2641,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typphys_addr_t addr;u64 size; -for (node =NULL ; (node =of_find_node_by_name (node, name)) !=NULL ;) { +for_each_node_by_name (node, name) {if (!compat)break ;if (of_device_is_compatible (node, compat))
Signature · 1 line
2.11.0.483.g087da7b7c-goog
PATCH 2/2 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.
--- arch/powerpc/kernel/setup-common.c | 9 +++++++-- arch/powerpc/platforms/cell/spu_manage.c | 4 ++-- arch/powerpc/platforms/powermac/pic.c | 7 ++++--- arch/powerpc/platforms/powermac/smp.c | 4 ++-- arch/powerpc/platforms/pseries/lparcfg.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)
arch/powerpc/kernel/setup-common.c +7 -2
@@ -452,13 +452,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;
@@ -498,6 +498,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
@@ -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
@@ -486,15 +486,16 @@ 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 */
arch/powerpc/platforms/powermac/smp.c +2 -2
@@ -772,8 +772,8 @@ 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 ;) - ++ncpus; +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
@@ -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
Signature · 1 line
2.11.0.483.g087da7b7c-goog
Michael Ellerman
AppliedRe: [2/2] powerpc: make use of for_each_node_by_type() instead of open-coding it
Quoted 6 lines · Dmitry Torokhov
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 Dmitry Torokhov <[email protected]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/9625e69a3818cc00fd85632719b4c6
cheers
Quoted 19 lines · Dmitry Torokhov
Instead of manually coding the loop with
of_find_node_by_name(), let's switch to the standard macro for iterating over nodes with given name.Signed-off-by Dmitry Torokhov <[email protected]>--- arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 3 +-- arch/powerpc/platforms/cell/setup.c | 3 +-- arch/powerpc/platforms/cell/spider-pic.c | 3 +-- arch/powerpc/platforms/powermac/feature.c | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-)arch/powerpc/platforms/83xx/mpc832x_mds.c +0
-0
arch/powerpc/platforms/83xx/mpc832x_mds.c static void __init mpc832x_sys_setup_arch(void) · line 78
Quoted 5 lines
arch/powerpc/platforms/83xx/mpc832x_mds.c +1
-1@@ -75,7 +75,7 @@ static void __init mpc832x_sys_setup_arch(void)par_io_init (np);of_node_put (np); -for (np =NULL ; (np =of_find_node_by_name (np,"ucc" )) !=NULL ;) + for_each_node_by_name(np. "ucc")
Gah, kbuild robot even told me about this typo and I missed it. Please let me know if you can fix up or if I should resend (or drop). I'd rather it not get dropped as I want to convert of_find_node_by_name() to stop dropping reference to the starting node, as half of the users do not expect it.
Thanks.
Signature · 1 line
Dmitry
Michael Ellerman
AppliedQuoted 4 lines · Dmitry Torokhov
Instead of manually coding the loop with
of_find_node_by_name(), let's switch to the standard macro for iterating over nodes with given name.Signed-off-by Dmitry Torokhov <[email protected]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/0aa8ff9b76282300d16e0a1403b115
cheers