3 files changed, 7 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 583af70c4b14..26ccbf77dd41 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -74,8 +74,7 @@ int default_machine_kexec_prepare(struct kimage *image)
         }
 
         /* We also should not overwrite the tce tables */
-        for (node = of_find_node_by_type(NULL, "pci"); node != NULL;
-                        node = of_find_node_by_type(node, "pci")) {
+        for_each_node_by_type(node, "pci") {
                 basep = of_get_property(node, "linux,tce-base", NULL);
                 sizep = of_get_property(node, "linux,tce-size", NULL);
                 if (basep == NULL || sizep == NULL)
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index aebef1320ed7..eade1fd8ee2e 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -278,7 +278,7 @@ static void __init initialize_cache_info(void)
 
         DBG(" -> initialize_cache_info()\n");
 
-        for (np = NULL; (np = of_find_node_by_type(np, "cpu"));) {
+        for_each_node_by_type(np, "cpu") {
                 num_cpus += 1;
 
                 /* We're assuming *all* of the CPUs have the same
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 2c1ae7a5fb53..00cc090cd1dc 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -710,7 +710,7 @@ static void __init parse_drconf_memory(struct device_node *memory)
 static int __init parse_numa_properties(void)
 {
         struct device_node *cpu = NULL;
-        struct device_node *memory = NULL;
+        struct device_node *memory;
         int default_nid = 0;
         unsigned long i;
 
@@ -750,8 +750,8 @@ static int __init parse_numa_properties(void)
         }
 
         get_n_mem_cells(&n_mem_addr_cells, &n_mem_size_cells);
-        memory = NULL;
-        while ((memory = of_find_node_by_type(memory, "memory")) != NULL) {
+
+        for_each_node_by_type(memory, "memory") {
                 unsigned long start;
                 unsigned long size;
                 int nid;
@@ -1187,10 +1187,10 @@ static int hot_add_drconf_scn_to_nid(struct device_node *memory,
  */
 int hot_add_node_scn_to_nid(unsigned long scn_addr)
 {
-        struct device_node *memory = NULL;
+        struct device_node *memory;
         int nid = -1;
 
-        while ((memory = of_find_node_by_type(memory, "memory")) != NULL) {
+        for_each_node_by_type(memory, "memory") {
                 unsigned long start, size;
                 int ranges;
                 const unsigned int *memcell_buf;