1 files changed, 16 insertions, 23 deletions

diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index bc6656b5708b..bbf81579b1f8 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -67,16 +67,6 @@ static struct pci_ops tile_cfg_ops;
 
 
 /*
- * We don't need to worry about the alignment of resources.
- */
-resource_size_t pcibios_align_resource(void *data, const struct resource *res,
-                            resource_size_t size, resource_size_t align)
-{
-        return res->start;
-}
-EXPORT_SYMBOL(pcibios_align_resource);
-
-/*
  * Open a FD to the hypervisor PCI device.
  *
  * controller_id is the controller number, config type is 0 or 1 for
@@ -274,6 +264,7 @@ static void fixup_read_and_payload_sizes(void)
  */
 int __init pcibios_init(void)
 {
+        struct pci_host_bridge *bridge;
         int i;
 
         pr_info("PCI: Probing PCI hardware\n");
@@ -306,16 +297,26 @@ int __init pcibios_init(void)
 
                         pci_add_resource(&resources, &ioport_resource);
                         pci_add_resource(&resources, &iomem_resource);
-                        bus = pci_scan_root_bus(NULL, 0, controller->ops,
-                                                controller, &resources);
+
+                        bridge = pci_alloc_host_bridge(0);
+                        if (!bridge)
+                                break;
+
+                        list_splice_init(&resources, &bridge->windows);
+                        bridge->dev.parent = NULL;
+                        bridge->sysdata = controller;
+                        bridge->busnr = 0;
+                        bridge->ops = controller->ops;
+                        bridge->swizzle_irq = pci_common_swizzle;
+                        bridge->map_irq = tile_map_irq;
+
+                        pci_scan_root_bus_bridge(bridge);
+                        bus = bridge->bus;
                         controller->root_bus = bus;
                         controller->last_busno = bus->busn_res.end;
                 }
         }
 
-        /* Do machine dependent PCI interrupt routing */
-        pci_fixup_irqs(pci_common_swizzle, tile_map_irq);
-
         /*
          * This comes from the generic Linux PCI driver.
          *
@@ -369,14 +370,6 @@ int __init pcibios_init(void)
 }
 subsys_initcall(pcibios_init);
 
-/*
- * No bus fixups needed.
- */
-void pcibios_fixup_bus(struct pci_bus *bus)
-{
-        /* Nothing needs to be done. */
-}
-
 void pcibios_set_master(struct pci_dev *dev)
 {
         /* No special bus mastering setup handling. */