forked from Minki/linux
powerpc: 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. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> [mpe: Fix build failures due to typo in mpc832x_mds.c] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
df26200299
commit
0aa8ff9b76
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -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. */
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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");
|
||||
|
@ -2641,7 +2641,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
|
||||
phys_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))
|
||||
|
Loading…
Reference in New Issue
Block a user