1 files changed, 2 insertions, 69 deletions

diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index eec7def379dc..e1af009617cf 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -1,6 +1,6 @@
 /* pci_sun4v.c: SUN4V specific PCI controller support.
  *
- * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
  */
 
 #include <linux/kernel.h>
@@ -751,72 +751,6 @@ static void pci_sun4v_resource_adjust(struct pci_dev *pdev,
         res->end += root->start;
 }
 
-/* Use ranges property to determine where PCI MEM, I/O, and Config
- * space are for this PCI bus module.
- */
-static void pci_sun4v_determine_mem_io_space(struct pci_pbm_info *pbm)
-{
-        int i, saw_mem, saw_io;
-
-        saw_mem = saw_io = 0;
-        for (i = 0; i < pbm->num_pbm_ranges; i++) {
-                struct linux_prom_pci_ranges *pr = &pbm->pbm_ranges[i];
-                unsigned long a;
-                int type;
-
-                type = (pr->child_phys_hi >> 24) & 0x3;
-                a = (((unsigned long)pr->parent_phys_hi << 32UL) |
-                     ((unsigned long)pr->parent_phys_lo  <<  0UL));
-
-                switch (type) {
-                case 1:
-                        /* 16-bit IO space, 16MB */
-                        pbm->io_space.start = a;
-                        pbm->io_space.end = a + ((16UL*1024UL*1024UL) - 1UL);
-                        pbm->io_space.flags = IORESOURCE_IO;
-                        saw_io = 1;
-                        break;
-
-                case 2:
-                        /* 32-bit MEM space, 2GB */
-                        pbm->mem_space.start = a;
-                        pbm->mem_space.end = a + (0x80000000UL - 1UL);
-                        pbm->mem_space.flags = IORESOURCE_MEM;
-                        saw_mem = 1;
-                        break;
-
-                case 3:
-                        /* XXX 64-bit MEM handling XXX */
-
-                default:
-                        break;
-                };
-        }
-
-        if (!saw_io || !saw_mem) {
-                prom_printf("%s: Fatal error, missing %s PBM range.\n",
-                            pbm->name,
-                            (!saw_io ? "IO" : "MEM"));
-                prom_halt();
-        }
-
-        printk("%s: PCI IO[%lx] MEM[%lx]\n",
-               pbm->name,
-               pbm->io_space.start,
-               pbm->mem_space.start);
-}
-
-static void pbm_register_toplevel_resources(struct pci_controller_info *p,
-                                            struct pci_pbm_info *pbm)
-{
-        pbm->io_space.name = pbm->mem_space.name = pbm->name;
-
-        request_resource(&ioport_resource, &pbm->io_space);
-        request_resource(&iomem_resource, &pbm->mem_space);
-        pci_register_legacy_regions(&pbm->io_space,
-                                    &pbm->mem_space);
-}
-
 static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,
                                             struct pci_iommu *iommu)
 {
@@ -1396,8 +1330,7 @@ static void pci_sun4v_pbm_init(struct pci_controller_info *p, struct device_node
         for (i = 0; i < pbm->num_pbm_ranges; i++)
                 pbm->pbm_ranges[i].parent_phys_hi &= 0x0fffffff;
 
-        pci_sun4v_determine_mem_io_space(pbm);
-        pbm_register_toplevel_resources(p, pbm);
+        pci_determine_mem_io_space(pbm);
 
         prop = of_find_property(dp, "interrupt-map", &len);
         pbm->pbm_intmap = prop->value;