[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, 5 insertions, 3 deletions

diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index b856bb67169c..8dbf2852bae0 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -647,6 +647,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_de
         struct media_bay_info* bay;
         u32 __iomem *regbase;
         struct device_node *ofnode;
+        unsigned long base;
         int i;
 
         ofnode = mdev->ofdev.node;
@@ -656,10 +657,11 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_de
         if (macio_request_resources(mdev, "media-bay"))
                 return -EBUSY;
         /* Media bay registers are located at the beginning of the
-         * mac-io chip, we get the parent address for now (hrm...)
+         * mac-io chip, for now, we trick and align down the first
+         * resource passed in
          */
-        regbase = (u32 __iomem *)
-                ioremap(ofnode->parent->addrs[0].address, 0x100);
+        base = macio_resource_start(mdev, 0) & 0xffff0000u;
+        regbase = (u32 __iomem *)ioremap(base, 0x100);
         if (regbase == NULL) {
                 macio_release_resources(mdev);
                 return -ENOMEM;