4 files changed, 17 insertions, 22 deletions

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 4f3febf8a589..dfd1b8095dad 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -313,7 +313,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
 {
         struct lpss_device_desc *dev_desc;
         struct lpss_private_data *pdata;
-        struct resource_list_entry *rentry;
+        struct resource_entry *rentry;
         struct list_head resource_list;
         struct platform_device *pdev;
         int ret;
@@ -333,12 +333,12 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
                 goto err_out;
 
         list_for_each_entry(rentry, &resource_list, node)
-                if (resource_type(&rentry->res) == IORESOURCE_MEM) {
+                if (resource_type(rentry->res) == IORESOURCE_MEM) {
                         if (dev_desc->prv_size_override)
                                 pdata->mmio_size = dev_desc->prv_size_override;
                         else
-                                pdata->mmio_size = resource_size(&rentry->res);
-                        pdata->mmio_base = ioremap(rentry->res.start,
+                                pdata->mmio_size = resource_size(rentry->res);
+                        pdata->mmio_base = ioremap(rentry->res->start,
                                                    pdata->mmio_size);
                         break;
                 }
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 6ba8beb6b9d2..1284138e42ab 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -45,7 +45,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
         struct platform_device *pdev = NULL;
         struct acpi_device *acpi_parent;
         struct platform_device_info pdevinfo;
-        struct resource_list_entry *rentry;
+        struct resource_entry *rentry;
         struct list_head resource_list;
         struct resource *resources = NULL;
         int count;
@@ -71,7 +71,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
                 }
                 count = 0;
                 list_for_each_entry(rentry, &resource_list, node)
-                        resources[count++] = rentry->res;
+                        resources[count++] = *rentry->res;
 
                 acpi_dev_free_resource_list(&resource_list);
         }
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 3ea0d17eb951..4752b9939987 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -444,12 +444,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_resource_interrupt);
  */
 void acpi_dev_free_resource_list(struct list_head *list)
 {
-        struct resource_list_entry *rentry, *re;
-
-        list_for_each_entry_safe(rentry, re, list, node) {
-                list_del(&rentry->node);
-                kfree(rentry);
-        }
+        resource_list_free(list);
 }
 EXPORT_SYMBOL_GPL(acpi_dev_free_resource_list);
 
@@ -464,16 +459,16 @@ struct res_proc_context {
 static acpi_status acpi_dev_new_resource_entry(struct resource_win *win,
                                                struct res_proc_context *c)
 {
-        struct resource_list_entry *rentry;
+        struct resource_entry *rentry;
 
-        rentry = kmalloc(sizeof(*rentry), GFP_KERNEL);
+        rentry = resource_list_create_entry(NULL, 0);
         if (!rentry) {
                 c->error = -ENOMEM;
                 return AE_NO_MEMORY;
         }
-        rentry->res = win->res;
+        *rentry->res = win->res;
         rentry->offset = win->offset;
-        list_add_tail(&rentry->node, c->list);
+        resource_list_add_tail(rentry, c->list);
         c->count++;
         return AE_OK;
 }
@@ -534,7 +529,7 @@ static acpi_status acpi_dev_process_resource(struct acpi_resource *ares,
  * returned as the final error code.
  *
  * The resultant struct resource objects are put on the list pointed to by
- * @list, that must be empty initially, as members of struct resource_list_entry
+ * @list, that must be empty initially, as members of struct resource_entry
  * objects.  Callers of this routine should use %acpi_dev_free_resource_list() to
  * free that list.
  *
diff --git a/drivers/dma/acpi-dma.c b/drivers/dma/acpi-dma.c
index de361a156b34..5a635646e05c 100644
--- a/drivers/dma/acpi-dma.c
+++ b/drivers/dma/acpi-dma.c
@@ -43,7 +43,7 @@ static int acpi_dma_parse_resource_group(const struct acpi_csrt_group *grp,
 {
         const struct acpi_csrt_shared_info *si;
         struct list_head resource_list;
-        struct resource_list_entry *rentry;
+        struct resource_entry *rentry;
         resource_size_t mem = 0, irq = 0;
         int ret;
 
@@ -56,10 +56,10 @@ static int acpi_dma_parse_resource_group(const struct acpi_csrt_group *grp,
                 return 0;
 
         list_for_each_entry(rentry, &resource_list, node) {
-                if (resource_type(&rentry->res) == IORESOURCE_MEM)
-                        mem = rentry->res.start;
-                else if (resource_type(&rentry->res) == IORESOURCE_IRQ)
-                        irq = rentry->res.start;
+                if (resource_type(rentry->res) == IORESOURCE_MEM)
+                        mem = rentry->res->start;
+                else if (resource_type(rentry->res) == IORESOURCE_IRQ)
+                        irq = rentry->res->start;
         }
 
         acpi_dev_free_resource_list(&resource_list);