1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index b530480cc7d5..9635d21e568d 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -807,11 +807,9 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                                          acpi_namespace_node *)
                                                         operand[0]);
                         if (temp_desc
-                            &&
-                            ((ACPI_GET_OBJECT_TYPE(temp_desc) ==
-                              ACPI_TYPE_STRING)
-                             || (ACPI_GET_OBJECT_TYPE(temp_desc) ==
-                                 ACPI_TYPE_LOCAL_REFERENCE))) {
+                            && ((temp_desc->common.type == ACPI_TYPE_STRING)
+                                || (temp_desc->common.type ==
+                                    ACPI_TYPE_LOCAL_REFERENCE))) {
                                 operand[0] = temp_desc;
                                 acpi_ut_add_reference(temp_desc);
                         } else {
@@ -819,7 +817,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 goto cleanup;
                         }
                 } else {
-                        switch (ACPI_GET_OBJECT_TYPE(operand[0])) {
+                        switch ((operand[0])->common.type) {
                         case ACPI_TYPE_LOCAL_REFERENCE:
                                 /*
                                  * This is a deref_of (local_x | arg_x)
@@ -877,8 +875,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                 if (ACPI_GET_DESCRIPTOR_TYPE(operand[0]) !=
                     ACPI_DESC_TYPE_NAMED) {
-                        if (ACPI_GET_OBJECT_TYPE(operand[0]) ==
-                            ACPI_TYPE_STRING) {
+                        if ((operand[0])->common.type == ACPI_TYPE_STRING) {
                                 /*
                                  * This is a deref_of (String). The string is a reference
                                  * to a named ACPI object.