From 6591380c935258fcc4486597647ba5b8d1dc6f91 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 23 Feb 2012 20:19:04 -0700 Subject: [PATCH] --- yaml --- r: 294767 b: refs/heads/master c: 4ba2aef3157f483fd67ac2616f14dbc32a3f751d h: refs/heads/master i: 294765: 82a93d78757b29c566e9384dbff88aba9626b482 294763: 46ca401014902ef17fda0b77cf141238c9bd8680 294759: aa6ba155ee0fdebfee6bdccfb0f01dd97ec12680 294751: de1a3da7c95fe74ee2e7bfb4f684e32f90ab4cb6 v: v3 --- [refs] | 2 +- trunk/arch/xtensa/kernel/pci.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 247f21bf21f3..3864b22f39b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac1edcc579b6554211221ee5eeac7dfc15a6da17 +refs/heads/master: 4ba2aef3157f483fd67ac2616f14dbc32a3f751d diff --git a/trunk/arch/xtensa/kernel/pci.c b/trunk/arch/xtensa/kernel/pci.c index 61045c192e88..eb30e356f5be 100644 --- a/trunk/arch/xtensa/kernel/pci.c +++ b/trunk/arch/xtensa/kernel/pci.c @@ -153,7 +153,7 @@ static void __init pci_controller_apertures(struct pci_controller *pci_ctrl, } res->start += io_offset; res->end += io_offset; - pci_add_resource(resources, res); + pci_add_resource_offset(resources, res, io_offset); for (i = 0; i < 3; i++) { res = &pci_ctrl->mem_resources[i]; @@ -200,24 +200,9 @@ subsys_initcall(pcibios_init); void __init pcibios_fixup_bus(struct pci_bus *bus) { - struct pci_controller *pci_ctrl = bus->sysdata; - struct resource *res; - unsigned long io_offset; - int i; - - io_offset = (unsigned long)pci_ctrl->io_space.base; if (bus->parent) { /* This is a subordinate bridge */ pci_read_bridge_bases(bus); - - for (i = 0; i < 4; i++) { - if ((res = bus->resource[i]) == NULL || !res->flags) - continue; - if (io_offset && (res->flags & IORESOURCE_IO)) { - res->start += io_offset; - res->end += io_offset; - } - } } }