[POWERPC] Use for_each macros in arch/powerpc/kernel

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index 9c74fdf29ee..80e2eef05b2 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -236,7 +236,7 @@ int __init btext_find_display(int allow_nonstdout)
         if (rc == 0 || !allow_nonstdout)
                 return rc;
 
-        for (np = NULL; (np = of_find_node_by_type(np, "display"));) {
+        for_each_node_by_type(np, "display") {
                 if (of_get_property(np, "linux,opened", NULL)) {
                         printk("trying %s ...\n", np->full_name);
                         rc = btext_initialize(np);
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index b9cae6b1f8c..4bfff8863bc 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -307,7 +307,7 @@ void __init find_legacy_serial_ports(void)
         }
 
         /* First fill our array with SOC ports */
-        for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16550")) != NULL;) {
+        for_each_compatible_node(np, "serial", "ns16550") {
                 struct device_node *soc = of_get_parent(np);
                 if (soc && !strcmp(soc->type, "soc")) {
                         index = add_legacy_soc_port(np, np);
@@ -318,7 +318,7 @@ void __init find_legacy_serial_ports(void)
         }
 
         /* First fill our array with ISA ports */
-        for (np = NULL; (np = of_find_node_by_type(np, "serial"));) {
+        for_each_node_by_type(np, "serial") {
                 struct device_node *isa = of_get_parent(np);
                 if (isa && !strcmp(isa->name, "isa")) {
                         index = add_legacy_isa_port(np, isa);
@@ -329,7 +329,7 @@ void __init find_legacy_serial_ports(void)
         }
 
         /* First fill our array with tsi-bridge ports */
-        for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16550")) != NULL;) {
+        for_each_compatible_node(np, "serial", "ns16550") {
                 struct device_node *tsi = of_get_parent(np);
                 if (tsi && !strcmp(tsi->type, "tsi-bridge")) {
                         index = add_legacy_soc_port(np, np);
@@ -340,7 +340,7 @@ void __init find_legacy_serial_ports(void)
         }
 
         /* First fill our array with opb bus ports */
-        for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16550")) != NULL;) {
+        for_each_compatible_node(np, "serial", "ns16550") {
                 struct device_node *opb = of_get_parent(np);
                 if (opb && (!strcmp(opb->type, "opb") ||
                             of_device_is_compatible(opb, "ibm,opb"))) {