6 files changed, 25 insertions, 38 deletions

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 4baad80ab731..217bcc2e8f86 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -1128,13 +1128,12 @@ arch_initcall(fs_enet_of_init);
 
 static int __init fsl_pcmcia_of_init(void)
 {
-        struct device_node *np = NULL;
+        struct device_node *np;
         /*
          * Register all the devices which type is "pcmcia"
          */
-        while ((np = of_find_compatible_node(np,
-                        "pcmcia", "fsl,pq-pcmcia")) != NULL)
-                            of_platform_device_create(np, "m8xx-pcmcia", NULL);
+        for_each_compatible_node(np, "pcmcia", "fsl,pq-pcmcia")
+                of_platform_device_create(np, "m8xx-pcmcia", NULL);
         return 0;
 }
 
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index 548a32082e4a..304056cafb1e 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -241,7 +241,7 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id)
 
         /* only register the shared platform device the first time through */
         if (id == 0 && (err = eth_register_shared_pdev(np)))
-                return err;;
+                return err;
 
         memset(r, 0, sizeof(r));
         of_irq_to_resource(np, 0, &r[0]);
@@ -451,22 +451,19 @@ static int __init mv64x60_device_setup(void)
         int id;
         int err;
 
-        for (id = 0;
-             (np = of_find_compatible_node(np, "serial", "marvell,mpsc")); id++)
-                if ((err = mv64x60_mpsc_device_setup(np, id)))
+        id = 0;
+        for_each_compatible_node(np, "serial", "marvell,mpsc")
+                if ((err = mv64x60_mpsc_device_setup(np, id++)))
                         goto error;
 
-        for (id = 0;
-             (np = of_find_compatible_node(np, "network",
-                                           "marvell,mv64x60-eth"));
-             id++)
-                if ((err = mv64x60_eth_device_setup(np, id)))
+        id = 0;
+        for_each_compatible_node(np, "network", "marvell,mv64x60-eth")
+                if ((err = mv64x60_eth_device_setup(np, id++)))
                         goto error;
 
-        for (id = 0;
-             (np = of_find_compatible_node(np, "i2c", "marvell,mv64x60-i2c"));
-             id++)
-                if ((err = mv64x60_i2c_device_setup(np, id)))
+        id = 0;
+        for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c")
+                if ((err = mv64x60_i2c_device_setup(np, id++)))
                         goto error;
 
         /* support up to one watchdog timer */
@@ -477,7 +474,6 @@ static int __init mv64x60_device_setup(void)
                 of_node_put(np);
         }
 
-
         return 0;
 
 error:
diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c
index 6933f9c73b43..d21ab8fa4993 100644
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -164,8 +164,8 @@ static int __init mv64x60_add_bridge(struct device_node *dev)
 
 void __init mv64x60_pci_init(void)
 {
-        struct device_node *np = NULL;
+        struct device_node *np;
 
-        while ((np = of_find_compatible_node(np, "pci", "marvell,mv64x60-pci")))
+        for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
                 mv64x60_add_bridge(np);
 }
diff --git a/arch/powerpc/sysdev/mv64x60_udbg.c b/arch/powerpc/sysdev/mv64x60_udbg.c
index 367e7b13ec00..35c77c7d0616 100644
--- a/arch/powerpc/sysdev/mv64x60_udbg.c
+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
@@ -85,10 +85,10 @@ static void mv64x60_udbg_init(void)
         if (!stdout)
                 return;
 
-        for (np = NULL;
-             (np = of_find_compatible_node(np, "serial", "marvell,mpsc")); )
+        for_each_compatible_node(np, "serial", "marvell,mpsc") {
                 if (np == stdout)
                         break;
+        }
 
         of_node_put(stdout);
         if (!np)
diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c
index a113d800cbf0..be2808a292f7 100644
--- a/arch/powerpc/sysdev/tsi108_dev.c
+++ b/arch/powerpc/sysdev/tsi108_dev.c
@@ -66,14 +66,12 @@ EXPORT_SYMBOL(get_vir_csrbase);
 static int __init tsi108_eth_of_init(void)
 {
         struct device_node *np;
-        unsigned int i;
+        unsigned int i = 0;
         struct platform_device *tsi_eth_dev;
         struct resource res;
         int ret;
 
-        for (np = NULL, i = 0;
-             (np = of_find_compatible_node(np, "network", "tsi108-ethernet")) != NULL;
-             i++) {
+        for_each_compatible_node(np, "network", "tsi108-ethernet") {
                 struct resource r[2];
                 struct device_node *phy, *mdio;
                 hw_info tsi_eth_data;
@@ -98,7 +96,7 @@ static int __init tsi108_eth_of_init(void)
                         __FUNCTION__,r[1].name, r[1].start, r[1].end);
 
                 tsi_eth_dev =
-                    platform_device_register_simple("tsi-ethernet", i, &r[0],
+                    platform_device_register_simple("tsi-ethernet", i++, &r[0],
                                                     1);
 
                 if (IS_ERR(tsi_eth_dev)) {
@@ -154,6 +152,7 @@ static int __init tsi108_eth_of_init(void)
 unreg:
         platform_device_unregister(tsi_eth_dev);
 err:
+        of_node_put(np);
         return ret;
 }
 
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index ae3eadddddbd..625b275c3795 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -309,28 +309,23 @@ void __init uic_init_tree(void)
         const u32 *interrupts;
 
         /* First locate and initialize the top-level UIC */
-
-        np = of_find_compatible_node(NULL, NULL, "ibm,uic");
-        while (np) {
+        for_each_compatible_node(np, NULL, "ibm,uic") {
                 interrupts = of_get_property(np, "interrupts", NULL);
-                if (! interrupts)
+                if (!interrupts)
                         break;
-
-                np = of_find_compatible_node(np, NULL, "ibm,uic");
         }
 
         BUG_ON(!np); /* uic_init_tree() assumes there's a UIC as the
                       * top-level interrupt controller */
         primary_uic = uic_init_one(np);
-        if (! primary_uic)
+        if (!primary_uic)
                 panic("Unable to initialize primary UIC %s\n", np->full_name);
 
         irq_set_default_host(primary_uic->irqhost);
         of_node_put(np);
 
         /* The scan again for cascaded UICs */
-        np = of_find_compatible_node(NULL, NULL, "ibm,uic");
-        while (np) {
+        for_each_compatible_node(np, NULL, "ibm,uic") {
                 interrupts = of_get_property(np, "interrupts", NULL);
                 if (interrupts) {
                         /* Secondary UIC */
@@ -348,8 +343,6 @@ void __init uic_init_tree(void)
 
                         /* FIXME: setup critical cascade?? */
                 }
-
-                np = of_find_compatible_node(np, NULL, "ibm,uic");
         }
 }