---

yaml
---
r: 294767
b: refs/heads/master
c: 4ba2aef
h: refs/heads/master
i:
  294765: 82a93d7
  294763: 46ca401
  294759: aa6ba15
  294751: de1a3da
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac1edcc579b6554211221ee5eeac7dfc15a6da17
+refs/heads/master: 4ba2aef3157f483fd67ac2616f14dbc32a3f751d

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;
-			}
-		}
 	}
 }