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, 6 insertions, 12 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 8fb16188cd82..90fa3a78fb7c 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -20,17 +20,16 @@
 void pci_add_resource_offset(struct list_head *resources, struct resource *res,
                              resource_size_t offset)
 {
-        struct pci_host_bridge_window *window;
+        struct resource_entry *entry;
 
-        window = kzalloc(sizeof(struct pci_host_bridge_window), GFP_KERNEL);
-        if (!window) {
+        entry = resource_list_create_entry(res, 0);
+        if (!entry) {
                 printk(KERN_ERR "PCI: can't add host bridge window %pR\n", res);
                 return;
         }
 
-        window->res = res;
-        window->offset = offset;
-        list_add_tail(&window->list, resources);
+        entry->offset = offset;
+        resource_list_add_tail(entry, resources);
 }
 EXPORT_SYMBOL(pci_add_resource_offset);
 
@@ -42,12 +41,7 @@ EXPORT_SYMBOL(pci_add_resource);
 
 void pci_free_resource_list(struct list_head *resources)
 {
-        struct pci_host_bridge_window *window, *tmp;
-
-        list_for_each_entry_safe(window, tmp, resources, list) {
-                list_del(&window->list);
-                kfree(window);
-        }
+        resource_list_free(resources);
 }
 EXPORT_SYMBOL(pci_free_resource_list);