1 files changed, 3 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index d32fedc991d3..3690624e49d4 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -99,7 +99,7 @@ int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
         struct pci_controller *hose = bus->sysdata;
         unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
                 | (((bus->number - hose->first_busno) & 0xff) << 16)
-                | (hose->index << 24);
+                | (hose->global_number << 24);
         int ret = -1;
         int rval;
 
@@ -114,7 +114,7 @@ int rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
         struct pci_controller *hose = bus->sysdata;
         unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
                 | (((bus->number - hose->first_busno) & 0xff) << 16)
-                | (hose->index << 24);
+                | (hose->global_number << 24);
         int rval;
 
         rval = rtas_call(rtas_token("write-pci-config"), 3, 1, NULL,
@@ -254,13 +254,12 @@ chrp_find_bridges(void)
                         printk(" at %llx", (unsigned long long)r.start);
                 printk("\n");
 
-                hose = pcibios_alloc_controller();
+                hose = pcibios_alloc_controller(dev);
                 if (!hose) {
                         printk("Can't allocate PCI controller structure for %s\n",
                                 dev->full_name);
                         continue;
                 }
-                hose->arch_data = dev;
                 hose->first_busno = bus_range[0];
                 hose->last_busno = bus_range[1];