3 files changed, 18 insertions, 28 deletions

diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c
index 4371f72ff025..98c223edac84 100644
--- a/arch/sparc/kernel/leon_pci.c
+++ b/arch/sparc/kernel/leon_pci.c
@@ -25,6 +25,12 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
 {
         LIST_HEAD(resources);
         struct pci_bus *root_bus;
+        struct pci_host_bridge *bridge;
+        int ret;
+
+        bridge = pci_alloc_host_bridge(0);
+        if (!bridge)
+                return;
 
         pci_add_resource_offset(&resources, &info->io_space,
                                 info->io_space.start - 0x1000);
@@ -32,15 +38,21 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
         info->busn.flags = IORESOURCE_BUS;
         pci_add_resource(&resources, &info->busn);
 
-        root_bus = pci_scan_root_bus(&ofdev->dev, 0, info->ops, info,
-                                     &resources);
-        if (!root_bus) {
-                pci_free_resource_list(&resources);
+        list_splice_init(&resources, &bridge->windows);
+        bridge->dev.parent = &ofdev->dev;
+        bridge->sysdata = info;
+        bridge->busnr = 0;
+        bridge->ops = info->ops;
+        bridge->swizzle_irq = pci_common_swizzle;
+        bridge->map_irq = info->map_irq;
+
+        ret = pci_scan_root_bus_bridge(bridge);
+        if (ret) {
+                pci_free_host_bridge(bridge);
                 return;
         }
 
-        /* Setup IRQs of all devices using custom routines */
-        pci_fixup_irqs(pci_common_swizzle, info->map_irq);
+        root_bus = bridge->bus;
 
         /* Assign devices with resources */
         pci_assign_unassigned_resources();
@@ -94,9 +106,3 @@ void pcibios_fixup_bus(struct pci_bus *pbus)
                 }
         }
 }
-
-resource_size_t pcibios_align_resource(void *data, const struct resource *res,
-                                resource_size_t size, resource_size_t align)
-{
-        return res->start;
-}
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 7eceaa10836f..3f8670c92951 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -690,16 +690,6 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
         return bus;
 }
 
-void pcibios_fixup_bus(struct pci_bus *pbus)
-{
-}
-
-resource_size_t pcibios_align_resource(void *data, const struct resource *res,
-                                resource_size_t size, resource_size_t align)
-{
-        return res->start;
-}
-
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
         u16 cmd, oldcmd;
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 732af9a9f6dd..4a133c052af8 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -746,12 +746,6 @@ static void watchdog_reset() {
 }
 #endif
 
-resource_size_t pcibios_align_resource(void *data, const struct resource *res,
-                                resource_size_t size, resource_size_t align)
-{
-        return res->start;
-}
-
 int pcibios_enable_device(struct pci_dev *pdev, int mask)
 {
         return 0;