1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index f6105a6d6126..c93b54ce7f78 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -149,7 +149,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
         /* This is a union acpi_operand_object    */
 
-        switch (ACPI_GET_OBJECT_TYPE(stack_desc)) {
+        switch (stack_desc->common.type) {
         case ACPI_TYPE_LOCAL_REFERENCE:
 
                 ref_type = stack_desc->reference.class;
@@ -297,8 +297,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                                   "FieldRead SourceDesc=%p Type=%X\n",
-                                  stack_desc,
-                                  ACPI_GET_OBJECT_TYPE(stack_desc)));
+                                  stack_desc, stack_desc->common.type));
 
                 status =
                     acpi_ex_read_data_from_field(walk_state, stack_desc,
@@ -386,7 +385,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
          * specification of the object_type and size_of operators). This means
          * traversing the list of possibly many nested references.
          */
-        while (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_REFERENCE) {
+        while (obj_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE) {
                 switch (obj_desc->reference.class) {
                 case ACPI_REFCLASS_REFOF:
                 case ACPI_REFCLASS_NAME:
@@ -518,7 +517,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
          * Now we are guaranteed to have an object that has not been created
          * via the ref_of or Index operators.
          */
-        type = ACPI_GET_OBJECT_TYPE(obj_desc);
+        type = obj_desc->common.type;
 
       exit:
         /* Convert internal types to external types */