4 files changed, 7 insertions, 12 deletions

diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 8bc422977b5b..4ff86878727f 100644
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -499,8 +499,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         }
 
         /* Lookup the i2c hwclock */
-        for (hwclock = NULL;
-             (hwclock = of_find_node_by_name(hwclock, "i2c-hwclock")) != NULL;){
+        for_each_node_by_name(hwclock, "i2c-hwclock") {
                 const char *loc = of_get_property(hwclock,
                                 "hwctrl-location", NULL);
                 if (loc == NULL)
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index 374b57fc596d..a12c8552f6a6 100644
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -134,8 +134,7 @@ static void cell_edac_init_csrows(struct mem_ctl_info *mci)
         int                             j;
         u32                             nr_pages;
 
-        for (np = NULL;
-             (np = of_find_node_by_name(np, "memory")) != NULL;) {
+        for_each_node_by_name(np, "memory") {
                 struct resource r;
 
                 /* We "know" that the Cell firmware only creates one entry
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 93aa29f6d39c..f2945fa73d4f 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -375,11 +375,11 @@ static void __exit cleanup_slots(void)
 
 static int __init rpaphp_init(void)
 {
-        struct device_node *dn = NULL;
+        struct device_node *dn;
 
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
-        while ((dn = of_find_node_by_name(dn, "pci")))
+        for_each_node_by_name(dn, "pci")
                 rpaphp_add_slot(dn);
 
         return 0;
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 8193635103ee..01e180bc6b5d 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1650,8 +1650,7 @@ static int __init pmz_probe(void)
         /*
          * Find all escc chips in the system
          */
-        node_p = of_find_node_by_name(NULL, "escc");
-        while (node_p) {
+        for_each_node_by_name(node_p, "escc") {
                 /*
                  * First get channel A/B node pointers
                  * 
@@ -1669,7 +1668,7 @@ static int __init pmz_probe(void)
                         of_node_put(node_b);
                         printk(KERN_ERR "pmac_zilog: missing node %c for escc %s\n",
                                 (!node_a) ? 'a' : 'b', node_p->full_name);
-                        goto next;
+                        continue;
                 }
 
                 /*
@@ -1696,11 +1695,9 @@ static int __init pmz_probe(void)
                         of_node_put(node_b);
                         memset(&pmz_ports[count], 0, sizeof(struct uart_pmac_port));
                         memset(&pmz_ports[count+1], 0, sizeof(struct uart_pmac_port));
-                        goto next;
+                        continue;
                 }
                 count += 2;
-next:
-                node_p = of_find_node_by_name(node_p, "escc");
         }
         pmz_ports_count = count;