Merge branch 'acpi-resources'

* acpi-resources: (23 commits)
  Merge branch 'pci/host-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into acpi-resources
  x86/irq, ACPI: Implement ACPI driver to support IOAPIC hotplug
  ACPI: Add interfaces to parse IOAPIC ID for IOAPIC hotplug
  x86/PCI: Refine the way to release PCI IRQ resources
  x86/PCI/ACPI: Use common ACPI resource interfaces to simplify implementation
  x86/PCI: Fix the range check for IO resources
  PCI: Use common resource list management code instead of private implementation
  resources: Move struct resource_list_entry from ACPI into resource core
  ACPI: Introduce helper function acpi_dev_filter_resource_type()
  ACPI: Add field offset to struct resource_list_entry
  ACPI: Translate resource into master side address for bridge window resources
  ACPI: Return translation offset when parsing ACPI address space resources
  ACPI: Enforce stricter checks for address space descriptors
  ACPI: Set flag IORESOURCE_UNSET for unassigned resources
  ACPI: Normalize return value of resource parser functions
  ACPI: Fix a bug in parsing ACPI Memory24 resource
  ACPI: Add prefetch decoding to the address space parser
  ACPI: Move the window flag logic to the combined parser
  ACPI: Unify the parsing of address_space and ext_address_space
  ACPI: Let the parser return false for disabled resources
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
index 0e5f3c95af5b..39b2dbe585aa 100644
--- a/drivers/pci/host-bridge.c
+++ b/drivers/pci/host-bridge.c
@@ -35,10 +35,10 @@ void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,
                              struct resource *res)
 {
         struct pci_host_bridge *bridge = find_pci_host_bridge(bus);
-        struct pci_host_bridge_window *window;
+        struct resource_entry *window;
         resource_size_t offset = 0;
 
-        list_for_each_entry(window, &bridge->windows, list) {
+        resource_list_for_each_entry(window, &bridge->windows) {
                 if (resource_contains(window->res, res)) {
                         offset = window->offset;
                         break;
@@ -60,10 +60,10 @@ void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
                              struct pci_bus_region *region)
 {
         struct pci_host_bridge *bridge = find_pci_host_bridge(bus);
-        struct pci_host_bridge_window *window;
+        struct resource_entry *window;
         resource_size_t offset = 0;
 
-        list_for_each_entry(window, &bridge->windows, list) {
+        resource_list_for_each_entry(window, &bridge->windows) {
                 struct pci_bus_region bus_region;
 
                 if (resource_type(res) != resource_type(window->res))