From bb835c39e67ec1fc2fbdc1cb14ba77cacaa5a647 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 12 Nov 2008 18:20:37 +0000
Subject: [PATCH] --- yaml --- r: 123032 b: refs/heads/master c:
 54018178ef05e32f140158cb7d7770b66042d131 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/powerpc/kernel/prom_parse.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 57003306414a..24a2bfe8cda8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e291b14c8f1101b9093434489bd4dc0e03f3d0f
+refs/heads/master: 54018178ef05e32f140158cb7d7770b66042d131
diff --git a/trunk/arch/powerpc/kernel/prom_parse.c b/trunk/arch/powerpc/kernel/prom_parse.c
index bc1fb27368af..2a1c02c56967 100644
--- a/trunk/arch/powerpc/kernel/prom_parse.c
+++ b/trunk/arch/powerpc/kernel/prom_parse.c
@@ -731,10 +731,7 @@ void of_irq_map_init(unsigned int flags)
 	if (flags & OF_IMAP_NO_PHANDLE) {
 		struct device_node *np;
 
-		for(np = NULL; (np = of_find_all_nodes(np)) != NULL;) {
-			if (of_get_property(np, "interrupt-controller", NULL)
-			    == NULL)
-				continue;
+		for_each_node_with_property(np, "interrupt-controller") {
 			/* Skip /chosen/interrupt-controller */
 			if (strcmp(np->name, "chosen") == 0)
 				continue;