3 files changed, 19 insertions, 24 deletions

diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 73c43a39663b..427cff1a3f83 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -63,7 +63,7 @@
 
 /* Version string */
 
-#define ACPI_CA_VERSION                 0x20050815
+#define ACPI_CA_VERSION                 0x20050902
 
 /*
  * OS name, used for the _OS object.  The _OS object is essentially obsolete,
diff --git a/include/acpi/acdispat.h b/include/acpi/acdispat.h
index 59306186f5e2..065f24a77cfc 100644
--- a/include/acpi/acdispat.h
+++ b/include/acpi/acdispat.h
@@ -194,8 +194,7 @@ acpi_status
 acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
                                union acpi_operand_object *return_desc);
 
-acpi_status
-acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state);
+void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state);
 
 acpi_status
 acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 254f4b06e7ef..6213b27516e8 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -1074,14 +1074,21 @@ struct acpi_resource_source {
         char *string_ptr;
 };
 
+/* Fields common to all address descriptors, 16/32/64 bit */
+
+#define ACPI_RESOURCE_ADDRESS_COMMON \
+        u32                                 resource_type; \
+        u32                                 producer_consumer; \
+        u32                                 decode; \
+        u32                                 min_address_fixed; \
+        u32                                 max_address_fixed; \
+        union acpi_resource_attribute       attribute;
+
+struct acpi_resource_address {
+ACPI_RESOURCE_ADDRESS_COMMON};
+
 struct acpi_resource_address16 {
-        u32 resource_type;
-        u32 producer_consumer;
-        u32 decode;
-        u32 min_address_fixed;
-        u32 max_address_fixed;
-        union acpi_resource_attribute attribute;
-        u32 granularity;
+        ACPI_RESOURCE_ADDRESS_COMMON u32 granularity;
         u32 min_address_range;
         u32 max_address_range;
         u32 address_translation_offset;
@@ -1090,13 +1097,7 @@ struct acpi_resource_address16 {
 };
 
 struct acpi_resource_address32 {
-        u32 resource_type;
-        u32 producer_consumer;
-        u32 decode;
-        u32 min_address_fixed;
-        u32 max_address_fixed;
-        union acpi_resource_attribute attribute;
-        u32 granularity;
+        ACPI_RESOURCE_ADDRESS_COMMON u32 granularity;
         u32 min_address_range;
         u32 max_address_range;
         u32 address_translation_offset;
@@ -1105,13 +1106,7 @@ struct acpi_resource_address32 {
 };
 
 struct acpi_resource_address64 {
-        u32 resource_type;
-        u32 producer_consumer;
-        u32 decode;
-        u32 min_address_fixed;
-        u32 max_address_fixed;
-        union acpi_resource_attribute attribute;
-        u64 granularity;
+        ACPI_RESOURCE_ADDRESS_COMMON u64 granularity;
         u64 min_address_range;
         u64 max_address_range;
         u64 address_translation_offset;
@@ -1161,6 +1156,7 @@ union acpi_resource_data {
         struct acpi_resource_mem24 memory24;
         struct acpi_resource_mem32 memory32;
         struct acpi_resource_fixed_mem32 fixed_memory32;
+        struct acpi_resource_address address;   /* Common 16/32/64 address fields */
         struct acpi_resource_address16 address16;
         struct acpi_resource_address32 address32;
         struct acpi_resource_address64 address64;