[PATCH] powerpc: Remove device_node addrs/n_addr

The pre-parsed addrs/n_addrs fields in struct device_node are finally
gone. Remove the dodgy heuristics that did that parsing at boot and
remove the fields themselves since we now have a good replacement with
the new OF parsing code. This patch also fixes a bunch of drivers to use
the new code instead, so that at least pmac32, pseries, iseries and g5
defconfigs build.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 10 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index feb0a94e781..5d9afa1fa02 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -258,15 +258,20 @@ int __init via_calibrate_decr(void)
         volatile unsigned char __iomem *via;
         int count = VIA_TIMER_FREQ_6 / 100;
         unsigned int dstart, dend;
+        struct resource rsrc;
 
-        vias = find_devices("via-cuda");
+        vias = of_find_node_by_name(NULL, "via-cuda");
         if (vias == 0)
-                vias = find_devices("via-pmu");
+                vias = of_find_node_by_name(NULL, "via-pmu");
         if (vias == 0)
-                vias = find_devices("via");
-        if (vias == 0 || vias->n_addrs == 0)
+                vias = of_find_node_by_name(NULL, "via");
+        if (vias == 0 || of_address_to_resource(vias, 0, &rsrc))
                 return 0;
-        via = ioremap(vias->addrs[0].address, vias->addrs[0].size);
+        via = ioremap(rsrc.start, rsrc.end - rsrc.start + 1);
+        if (via == NULL) {
+                printk(KERN_ERR "Failed to map VIA for timer calibration !\n");
+                return 0;
+        }
 
         /* set timer 1 for continuous interrupts */
         out_8(&via[ACR], (via[ACR] & ~T1MODE) | T1MODE_CONT);