[POWERPC] Remove old interface find_devices

Replace uses with of_find_node_by_name and for_each_node_by_name.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

5 files changed, 25 insertions, 13 deletions

diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index cdd5a0f72e3c..e54c4d9f6365 100644
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -145,11 +145,12 @@ anslcd_init(void)
         int retval;
         struct device_node* node;
 
-        node = find_devices("lcd");
-        if (!node || !node->parent)
-                return -ENODEV;
-        if (strcmp(node->parent->name, "gc"))
+        node = of_find_node_by_name(NULL, "lcd");
+        if (!node || !node->parent || strcmp(node->parent->name, "gc")) {
+                of_node_put(node);
                 return -ENODEV;
+        }
+        of_node_put(node);
 
         anslcd_ptr = ioremap(ANSLCD_ADDR, 0x20);
         
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 7b7db5db50dc..e31cb1e7a47b 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -487,7 +487,8 @@ static int __init via_pmu_dev_init(void)
                 pmu_batteries[0].flags |= PMU_BATT_TYPE_SMART;
                 pmu_batteries[1].flags |= PMU_BATT_TYPE_SMART;
         } else {
-                struct device_node* prim = find_devices("power-mgt");
+                struct device_node* prim =
+                        of_find_node_by_name(NULL, "power-mgt");
                 const u32 *prim_info = NULL;
                 if (prim)
                         prim_info = of_get_property(prim, "prim-info", NULL);
@@ -498,6 +499,7 @@ static int __init via_pmu_dev_init(void)
                         if (pmu_battery_count > 1)
                                 pmu_batteries[1].flags |= PMU_BATT_TYPE_SMART;
                 }
+                of_node_put(prim);
         }
 #endif /* CONFIG_PPC32 */
 
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index 86d2884e16c6..e6e61df0d071 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -2160,7 +2160,7 @@ static int find_planb(void)
         if (!machine_is(powermac))
                 return 0;
 
-        planb_devices = find_devices("planb");
+        planb_devices = of_find_node_by_name(NULL, "planb");
         if (planb_devices == 0) {
                 planb_num=0;
                 printk(KERN_WARNING "PlanB: no device found!\n");
@@ -2175,12 +2175,14 @@ static int find_planb(void)
         if (planb_devices->n_addrs != 1) {
                 printk (KERN_WARNING "PlanB: expecting 1 address for planb "
                         "(got %d)", planb_devices->n_addrs);
+                of_node_put(planb_devices);
                 return 0;
         }
 
         if (planb_devices->n_intrs == 0) {
                 printk(KERN_WARNING "PlanB: no intrs for device %s\n",
                        planb_devices->full_name);
+                of_node_put(planb_devices);
                 return 0;
         } else {
                 irq = planb_devices->intrs[0].line;
@@ -2202,6 +2204,7 @@ static int find_planb(void)
         confreg = planb_devices->addrs[0].space & 0xff;
         old_base = planb_devices->addrs[0].address;
         new_base = 0xf1000000;
+        of_node_put(planb_devices);
 
         DEBUG("PlanB: Found on bus %d, dev %d, func %d, "
                 "membase 0x%x (base reg. 0x%x)\n",
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 2b163c532e0d..cd92a3966b0c 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1467,7 +1467,8 @@ no_dma:
         if (ZS_IS_IRDA(uap))
                 uap->port_type = PMAC_SCC_IRDA;
         if (ZS_IS_INTMODEM(uap)) {
-                struct device_node* i2c_modem = find_devices("i2c-modem");
+                struct device_node* i2c_modem =
+                        of_find_node_by_name(NULL, "i2c-modem");
                 if (i2c_modem) {
                         const char* mid =
                                 of_get_property(i2c_modem, "modem-id", NULL);
@@ -1482,6 +1483,7 @@ no_dma:
                         }
                         printk(KERN_INFO "pmac_zilog: i2c-modem detected, id: %d\n",
                                 mid ? (*mid) : 0);
+                        of_node_put(i2c_modem);
                 } else {
                         printk(KERN_INFO "pmac_zilog: serial modem detected\n");
                 }
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index fd60dba294da..8b762739b1e0 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -179,12 +179,14 @@ MODULE_LICENSE("GPL");
 int init_module(void)
 {
         struct device_node *dp;
+        int ret = -ENXIO;
 
-        dp = find_devices("control");
+        dp = of_find_node_by_name(NULL, "control");
         if (dp != 0 && !control_of_init(dp))
-                return 0;
+                ret = 0;
+        of_node_put(dp);
 
-        return -ENXIO;
+        return ret;
 }
 
 void cleanup_module(void)
@@ -589,16 +591,18 @@ static int __init control_init(void)
 {
         struct device_node *dp;
         char *option = NULL;
+        int ret = -ENXIO;
 
         if (fb_get_options("controlfb", &option))
                 return -ENODEV;
         control_setup(option);
 
-        dp = find_devices("control");
+        dp = of_find_node_by_name(NULL, "control");
         if (dp != 0 && !control_of_init(dp))
-                return 0;
+                ret = 0;
+        of_node_put(dp);
 
-        return -ENXIO;
+        return ret;
 }
 
 module_init(control_init);