9 files changed, 78 insertions, 64 deletions

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 860c88b2f6d1..caef555f2dc0 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1072,25 +1072,6 @@ int of_n_size_cells(struct device_node* np)
 }
 EXPORT_SYMBOL(of_n_size_cells);
 
-/**
- * Construct and return a list of the device_nodes with a given name.
- */
-struct device_node *find_devices(const char *name)
-{
-        struct device_node *head, **prevp, *np;
-
-        prevp = &head;
-        for (np = allnodes; np != 0; np = np->allnext) {
-                if (np->name != 0 && strcasecmp(np->name, name) == 0) {
-                        *prevp = np;
-                        prevp = &np->next;
-                }
-        }
-        *prevp = NULL;
-        return head;
-}
-EXPORT_SYMBOL(find_devices);
-
 /** Checks if the given "compat" string matches one of the strings in
  * the device's "compatible" property
  */
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index a09277a8639f..9eaefac5053f 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -308,7 +308,7 @@ static int __init vio_bus_init(void)
                 return err;
         }
 
-        node_vroot = find_devices("vdevice");
+        node_vroot = of_find_node_by_name(NULL, "vdevice");
         if (node_vroot) {
                 struct device_node *of_node;
 
@@ -322,6 +322,7 @@ static int __init vio_bus_init(void)
                                         __FUNCTION__, of_node);
                         vio_register_device_node(of_node);
                 }
+                of_node_put(node_vroot);
         }
 
         return 0;
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index de776e3889e3..1469d6478f67 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -136,9 +136,11 @@ hydra_init(void)
         struct device_node *np;
         struct resource r;
 
-        np = find_devices("mac-io");
-        if (np == NULL || of_address_to_resource(np, 0, &r))
+        np = of_find_node_by_name(NULL, "mac-io");
+        if (np == NULL || of_address_to_resource(np, 0, &r)) {
+                of_node_put(np);
                 return 0;
+        }
         Hydra = ioremap(r.start, r.end-r.start);
         printk("Hydra Mac I/O at %llx\n", (unsigned long long)r.start);
         printk("Hydra Feature_Control was %x",
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 9c1b231b1ff9..1870038a8e0a 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -468,7 +468,7 @@ static void __init chrp_find_8259(void)
          * Also, Pegasos-type platforms don't have a proper node to start
          * from anyway
          */
-        for (np = find_devices("pci"); np != NULL; np = np->next) {
+        for_each_node_by_name(np, "pci") {
                 const unsigned int *addrp = of_get_property(np,
                                 "8259-interrupt-acknowledge", NULL);
 
@@ -477,6 +477,7 @@ static void __init chrp_find_8259(void)
                 chrp_int_ack = addrp[of_n_addr_cells(np)-1];
                 break;
         }
+        of_node_put(np);
         if (np == NULL)
                 printk(KERN_WARNING "Cannot find PCI interrupt acknowledge"
                        " address, polling\n");
@@ -518,10 +519,11 @@ void __init chrp_init_IRQ(void)
 #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_XMON)
         /* see if there is a keyboard in the device tree
            with a parent of type "adb" */
-        for (kbd = find_devices("keyboard"); kbd; kbd = kbd->next)
+        for_each_node_by_name(kbd, "keyboard")
                 if (kbd->parent && kbd->parent->type
                     && strcmp(kbd->parent->type, "adb") == 0)
                         break;
+        of_node_put(kbd);
         if (kbd)
                 setup_irq(HYDRA_INT_ADB_NMI, &xmon_irqaction);
 #endif
@@ -547,7 +549,7 @@ chrp_init2(void)
         /* Get the event scan rate for the rtas so we know how
          * often it expects a heartbeat. -- Cort
          */
-        device = find_devices("rtas");
+        device = of_find_node_by_name(NULL, "rtas");
         if (device)
                 p = of_get_property(device, "rtas-event-scan-rate", NULL);
         if (p && *p) {
@@ -576,6 +578,7 @@ chrp_init2(void)
                 printk("RTAS Event Scan Rate: %u (%lu jiffies)\n",
                        *p, interval);
         }
+        of_node_put(device);
 
         if (ppc_md.progress)
                 ppc_md.progress("  Have fun!    ", 0x7777);
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index 0dc8a45c408a..d679964ae2ab 100644
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
@@ -56,13 +56,16 @@ struct backlight_device *pmac_backlight;
 
 int pmac_has_backlight_type(const char *type)
 {
-        struct device_node* bk_node = find_devices("backlight");
+        struct device_node* bk_node = of_find_node_by_name(NULL, "backlight");
 
         if (bk_node) {
                 const char *prop = of_get_property(bk_node,
                                 "backlight-control", NULL);
-                if (prop && strncmp(prop, type, strlen(type)) == 0)
+                if (prop && strncmp(prop, type, strlen(type)) == 0) {
+                        of_node_put(bk_node);
                         return 1;
+                }
+                of_node_put(bk_node);
         }
 
         return 0;
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 44f85507db3c..52cfdd86c928 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -2408,12 +2408,13 @@ static int __init probe_motherboard(void)
         struct macio_chip *macio = &macio_chips[0];
         const char *model = NULL;
         struct device_node *dt;
+        int ret = 0;
 
         /* Lookup known motherboard type in device-tree. First try an
          * exact match on the "model" property, then try a "compatible"
          * match is none is found.
          */
-        dt = find_devices("device-tree");
+        dt = of_find_node_by_name(NULL, "device-tree");
         if (dt != NULL)
                 model = of_get_property(dt, "model", NULL);
         for(i=0; model && i<(sizeof(pmac_mb_defs)/sizeof(struct pmac_mb_def)); i++) {
@@ -2478,15 +2479,18 @@ static int __init probe_motherboard(void)
                 break;
 #endif /* CONFIG_POWER4 */
         default:
-                return -ENODEV;
+                ret = -ENODEV;
+                goto done;
         }
 found:
 #ifndef CONFIG_POWER4
         /* Fixup Hooper vs. Comet */
         if (pmac_mb.model_id == PMAC_TYPE_HOOPER) {
                 u32 __iomem * mach_id_ptr = ioremap(0xf3000034, 4);
-                if (!mach_id_ptr)
-                        return -ENODEV;
+                if (!mach_id_ptr) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 /* Here, I used to disable the media-bay on comet. It
                  * appears this is wrong, the floppy connector is actually
                  * a kind of media-bay and works with the current driver.
@@ -2544,7 +2548,9 @@ found:
 
 
         printk(KERN_INFO "PowerMac motherboard: %s\n", pmac_mb.model_name);
-        return 0;
+done:
+        of_node_put(dt);
+        return ret;
 }
 
 /* Initialize the Core99 UniNorth host bridge and memory controller
@@ -2747,12 +2753,14 @@ set_initial_features(void)
          * differenciate them all and since that hack was there for a long
          * time, I'll keep it around
          */
-        if (macio_chips[0].type == macio_ohare && !find_devices("via-pmu")) {
-                struct macio_chip *macio = &macio_chips[0];
-                MACIO_OUT32(OHARE_FCR, STARMAX_FEATURES);
-        } else if (macio_chips[0].type == macio_ohare) {
+        if (macio_chips[0].type == macio_ohare) {
                 struct macio_chip *macio = &macio_chips[0];
-                MACIO_BIS(OHARE_FCR, OH_IOBUS_ENABLE);
+                np = of_find_node_by_name(NULL, "via-pmu");
+                if (np)
+                        MACIO_BIS(OHARE_FCR, OH_IOBUS_ENABLE);
+                else
+                        MACIO_OUT32(OHARE_FCR, STARMAX_FEATURES);
+                of_node_put(np);
         } else if (macio_chips[1].type == macio_ohare) {
                 struct macio_chip *macio = &macio_chips[1];
                 MACIO_BIS(OHARE_FCR, OH_IOBUS_ENABLE);
@@ -2845,14 +2853,13 @@ set_initial_features(void)
                 }
 
                 /* Switch airport off */
-                np = find_devices("radio");
-                while(np) {
+                for_each_node_by_name(np, "radio") {
                         if (np && np->parent == macio_chips[0].of_node) {
                                 macio_chips[0].flags |= MACIO_FLAG_AIRPORT_ON;
                                 core99_airport_enable(np, 0, 0);
                         }
-                        np = np->next;
                 }
+                of_node_put(np);
         }
 
         /* On all machines that support sound PM, switch sound off */
@@ -2872,16 +2879,12 @@ set_initial_features(void)
 #endif /* CONFIG_POWER4 */
 
         /* On all machines, switch modem & serial ports off */
-        np = find_devices("ch-a");
-        while(np) {
+        for_each_node_by_name(np, "ch-a")
                 initial_serial_shutdown(np);
-                np = np->next;
-        }
-        np = find_devices("ch-b");
-        while(np) {
+        of_node_put(np);
+        for_each_node_by_name(np, "ch-b")
                 initial_serial_shutdown(np);
-                np = np->next;
-        }
+        of_node_put(np);
 }
 
 void __init
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 092cef4160a1..22c4ae4c6934 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -622,13 +622,14 @@ static void __init init_p2pbridge(void)
 
         /* XXX it would be better here to identify the specific
            PCI-PCI bridge chip we have. */
-        if ((p2pbridge = find_devices("pci-bridge")) == 0
+        p2pbridge = of_find_node_by_name(NULL, "pci-bridge");
+        if (p2pbridge == NULL
             || p2pbridge->parent == NULL
             || strcmp(p2pbridge->parent->name, "pci") != 0)
-                return;
+                goto done;
         if (pci_device_from_OF_node(p2pbridge, &bus, &devfn) < 0) {
                 DBG("Can't find PCI infos for PCI<->PCI bridge\n");
-                return;
+                goto done;
         }
         /* Warning: At this point, we have not yet renumbered all busses.
          * So we must use OF walking to find out hose
@@ -636,16 +637,18 @@ static void __init init_p2pbridge(void)
         hose = pci_find_hose_for_OF_device(p2pbridge);
         if (!hose) {
                 DBG("Can't find hose for PCI<->PCI bridge\n");
-                return;
+                goto done;
         }
         if (early_read_config_word(hose, bus, devfn,
                                    PCI_BRIDGE_CONTROL, &val) < 0) {
                 printk(KERN_ERR "init_p2pbridge: couldn't read bridge"
                        " control\n");
-                return;
+                goto done;
         }
         val &= ~PCI_BRIDGE_CTL_MASTER_ABORT;
         early_write_config_word(hose, bus, devfn, PCI_BRIDGE_CONTROL, val);
+done:
+        of_node_put(p2pbridge);
 }
 
 static void __init init_second_ohare(void)
@@ -1199,8 +1202,7 @@ void __init pmac_pcibios_after_init(void)
         }
 #endif /* CONFIG_BLK_DEV_IDE */
 
-        nd = find_devices("firewire");
-        while (nd) {
+        for_each_node_by_name(nd, "firewire") {
                 if (nd->parent && (device_is_compatible(nd, "pci106b,18") ||
                                    device_is_compatible(nd, "pci106b,30") ||
                                    device_is_compatible(nd, "pci11c1,5811"))
@@ -1208,15 +1210,14 @@ void __init pmac_pcibios_after_init(void)
                         pmac_call_feature(PMAC_FTR_1394_ENABLE, nd, 0, 0);
                         pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, nd, 0, 0);
                 }
-                nd = nd->next;
         }
-        nd = find_devices("ethernet");
-        while (nd) {
+        of_node_put(nd);
+        for_each_node_by_name(nd, "ethernet") {
                 if (nd->parent && device_is_compatible(nd, "gmac")
                     && device_is_compatible(nd->parent, "uni-north"))
                         pmac_call_feature(PMAC_FTR_GMAC_ENABLE, nd, 0, 0);
-                nd = nd->next;
         }
+        of_node_put(nd);
 }
 
 #ifdef CONFIG_PPC32
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index ae37d3e23783..0444e07e8d7a 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -193,8 +193,11 @@ static void pmac_show_cpuinfo(struct seq_file *m)
 #ifndef CONFIG_ADB_CUDA
 int find_via_cuda(void)
 {
-        if (!find_devices("via-cuda"))
+        struct device_node *dn = of_find_node_by_name(NULL, "via-cuda");
+
+        if (!dn)
                 return 0;
+        of_node_put(dn);
         printk("WARNING ! Your machine is CUDA-based but your kernel\n");
         printk("          wasn't compiled with CONFIG_ADB_CUDA option !\n");
         return 0;
@@ -204,8 +207,11 @@ int find_via_cuda(void)
 #ifndef CONFIG_ADB_PMU
 int find_via_pmu(void)
 {
-        if (!find_devices("via-pmu"))
+        struct device_node *dn = of_find_node_by_name(NULL, "via-pmu");
+
+        if (!dn)
                 return 0;
+        of_node_put(dn);
         printk("WARNING ! Your machine is PMU-based but your kernel\n");
         printk("          wasn't compiled with CONFIG_ADB_PMU option !\n");
         return 0;
@@ -225,6 +231,8 @@ static volatile u32 *sysctrl_regs;
 
 static void __init ohare_init(void)
 {
+        struct device_node *dn;
+
         /* this area has the CPU identification register
            and some registers used by smp boards */
         sysctrl_regs = (volatile u32 *) ioremap(0xf8000000, 0x1000);
@@ -234,7 +242,9 @@ static void __init ohare_init(void)
          * We assume that we have a PSX memory controller iff
          * we have an ohare I/O controller.
          */
-        if (find_devices("ohare") != NULL) {
+        dn = of_find_node_by_name(NULL, "ohare");
+        if (dn) {
+                of_node_put(dn);
                 if (((sysctrl_regs[2] >> 24) & 0xf) >= 3) {
                         if (sysctrl_regs[4] & 0x10)
                                 sysctrl_regs[4] |= 0x04000020;
@@ -343,8 +353,15 @@ static void __init pmac_setup_arch(void)
 
 #ifdef CONFIG_SMP
         /* Check for Core99 */
-        if (find_devices("uni-n") || find_devices("u3") || find_devices("u4"))
+        ic = of_find_node_by_name(NULL, "uni-n");
+        if (!ic)
+                ic = of_find_node_by_name(NULL, "u3");
+        if (!ic)
+                ic = of_find_node_by_name(NULL, "u4");
+        if (ic) {
+                of_node_put(ic);
                 smp_ops = &core99_smp_ops;
+        }
 #ifdef CONFIG_PPC32
         else
                 smp_ops = &psurge_smp_ops;
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 20f328678fd1..6f32c4eca6e5 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -264,6 +264,7 @@ static void __init psurge_quad_init(void)
 static int __init smp_psurge_probe(void)
 {
         int i, ncpus;
+        struct device_node *dn;
 
         /* We don't do SMP on the PPC601 -- paulus */
         if (PVR_VER(mfspr(SPRN_PVR)) == 1)
@@ -279,8 +280,10 @@ static int __init smp_psurge_probe(void)
          * in the hammerhead memory controller in the case of the
          * dual-cpu powersurge board.  -- paulus.
          */
-        if (find_devices("hammerhead") == NULL)
+        dn = of_find_node_by_name(NULL, "hammerhead");
+        if (dn == NULL)
                 return 1;
+        of_node_put(dn);
 
         hhead_base = ioremap(HAMMERHEAD_BASE, 0x800);
         quad_base = ioremap(PSURGE_QUAD_REG_ADDR, 1024);