1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index 9c9897dbe90..99bfbd23258 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -248,7 +248,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 
         /* Map the return object type to the bitmapped type */
 
-        switch (ACPI_GET_OBJECT_TYPE(info->return_object)) {
+        switch ((info->return_object)->common.type) {
         case ACPI_TYPE_INTEGER:
                 return_btype = ACPI_BTYPE_INTEGER;
                 break;
@@ -418,7 +418,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
                 return_ACPI_STATUS(status);
         }
 
-        if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
+        if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
 
                 /* Convert the Numeric HID to string */
 
@@ -459,7 +459,7 @@ acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,
                           struct acpi_compatible_id *one_cid)
 {
 
-        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+        switch (obj_desc->common.type) {
         case ACPI_TYPE_INTEGER:
 
                 /* Convert the Numeric CID to string */
@@ -527,7 +527,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node,
         /* Get the number of _CIDs returned */
 
         count = 1;
-        if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_PACKAGE) {
+        if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
                 count = obj_desc->package.count;
         }
 
@@ -555,7 +555,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node,
 
         /* The _CID object can be either a single CID or a package (list) of CIDs */
 
-        if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_PACKAGE) {
+        if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
 
                 /* Translate each package element */
 
@@ -620,7 +620,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
                 return_ACPI_STATUS(status);
         }
 
-        if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
+        if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
 
                 /* Convert the Numeric UID to string */