[ACPI] handle ACPICA 20050916's acpi_resource.type rename

Signed-off-by: Len Brown <len.brown@intel.com>

5 files changed, 14 insertions, 14 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 7e1a445955bc..c33bfba5df8f 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1151,7 +1151,7 @@ acpi_ec_io_ports(struct acpi_resource *resource, void *context)
         union acpi_ec *ec = (union acpi_ec *)context;
         struct acpi_generic_address *addr;
 
-        if (resource->id != ACPI_RSTYPE_IO) {
+        if (resource->type != ACPI_RSTYPE_IO) {
                 return AE_OK;
         }
 
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index e36c5da2b31a..00aeb4801d7a 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -99,9 +99,9 @@ do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
         int *busnr = (int *)data;
         struct acpi_resource_address64 address;
 
-        if (resource->id != ACPI_RSTYPE_ADDRESS16 &&
-            resource->id != ACPI_RSTYPE_ADDRESS32 &&
-            resource->id != ACPI_RSTYPE_ADDRESS64)
+        if (resource->type != ACPI_RSTYPE_ADDRESS16 &&
+            resource->type != ACPI_RSTYPE_ADDRESS32 &&
+            resource->type != ACPI_RSTYPE_ADDRESS64)
                 return AE_OK;
 
         acpi_resource_to_address64(resource, &address);
diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c
index e928e8c2c6ec..85c1fb5c9a5a 100644
--- a/drivers/acpi/motherboard.c
+++ b/drivers/acpi/motherboard.c
@@ -54,7 +54,7 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
 
         ACPI_FUNCTION_TRACE("acpi_reserve_io_ranges");
 
-        if (res->id == ACPI_RSTYPE_IO) {
+        if (res->type == ACPI_RSTYPE_IO) {
                 struct acpi_resource_io *io_res = &res->data.io;
 
                 if (io_res->min_base_address != io_res->max_base_address)
@@ -70,7 +70,7 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
                             request_region(io_res->min_base_address,
                                            io_res->range_length, "motherboard");
                 }
-        } else if (res->id == ACPI_RSTYPE_FIXED_IO) {
+        } else if (res->type == ACPI_RSTYPE_FIXED_IO) {
                 struct acpi_resource_fixed_io *fixed_io_res =
                     &res->data.fixed_io;
 
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 82292b77e5c6..d8956c0bf143 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -108,7 +108,7 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
 
         ACPI_FUNCTION_TRACE("acpi_pci_link_check_possible");
 
-        switch (resource->id) {
+        switch (resource->type) {
         case ACPI_RSTYPE_START_DPF:
                 return_ACPI_STATUS(AE_OK);
         case ACPI_RSTYPE_IRQ:
@@ -201,7 +201,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
 
         ACPI_FUNCTION_TRACE("acpi_pci_link_check_current");
 
-        switch (resource->id) {
+        switch (resource->type) {
         case ACPI_RSTYPE_IRQ:
                 {
                         struct acpi_resource_irq *p = &resource->data.irq;
@@ -326,7 +326,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
 
         switch (link->irq.resource_type) {
         case ACPI_RSTYPE_IRQ:
-                resource->res.id = ACPI_RSTYPE_IRQ;
+                resource->res.type = ACPI_RSTYPE_IRQ;
                 resource->res.length = sizeof(struct acpi_resource);
                 resource->res.data.irq.edge_level = link->irq.edge_level;
                 resource->res.data.irq.active_high_low =
@@ -341,7 +341,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
                 break;
 
         case ACPI_RSTYPE_EXT_IRQ:
-                resource->res.id = ACPI_RSTYPE_EXT_IRQ;
+                resource->res.type = ACPI_RSTYPE_EXT_IRQ;
                 resource->res.length = sizeof(struct acpi_resource);
                 resource->res.data.extended_irq.producer_consumer =
                     ACPI_CONSUMER;
@@ -364,7 +364,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
                 goto end;
 
         }
-        resource->end.id = ACPI_RSTYPE_END_TAG;
+        resource->end.type = ACPI_RSTYPE_END_TAG;
 
         /* Attempt to set the resource */
         status = acpi_set_current_resources(link->handle, &buffer);
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 0fd9988c283d..5d6bc815fe72 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -122,9 +122,9 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
         int *busnr = (int *)data;
         struct acpi_resource_address64 address;
 
-        if (resource->id != ACPI_RSTYPE_ADDRESS16 &&
-            resource->id != ACPI_RSTYPE_ADDRESS32 &&
-            resource->id != ACPI_RSTYPE_ADDRESS64)
+        if (resource->type != ACPI_RSTYPE_ADDRESS16 &&
+            resource->type != ACPI_RSTYPE_ADDRESS32 &&
+            resource->type != ACPI_RSTYPE_ADDRESS64)
                 return AE_OK;
 
         acpi_resource_to_address64(resource, &address);