1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index fd5ea7543e5b..0207b625274a 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -310,7 +310,7 @@ u8 acpi_ut_valid_internal_object(void *object)
         /* Check for a null pointer */
 
         if (!object) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "**** Null Object Ptr\n"));
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "**** Null Object Ptr\n"));
                 return (FALSE);
         }
 
@@ -324,7 +324,7 @@ u8 acpi_ut_valid_internal_object(void *object)
                 return (TRUE);
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                                   "%p is not not an ACPI operand obj [%s]\n",
                                   object, acpi_ut_get_descriptor_name(object)));
                 break;
@@ -457,7 +457,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
          * must be accessed bytewise or there may be alignment problems on
          * certain processors
          */
-        switch (ACPI_GET_OBJECT_TYPE(internal_object)) {
+        switch (internal_object->common.type) {
         case ACPI_TYPE_STRING:
 
                 length += (acpi_size) internal_object->string.length + 1;
@@ -518,8 +518,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                 ACPI_ERROR((AE_INFO, "Cannot convert to external object - "
                             "unsupported type [%s] %X in object %p",
                             acpi_ut_get_object_type_name(internal_object),
-                            ACPI_GET_OBJECT_TYPE(internal_object),
-                            internal_object));
+                            internal_object->common.type, internal_object));
                 status = AE_TYPE;
                 break;
         }
@@ -664,7 +663,7 @@ acpi_ut_get_object_size(union acpi_operand_object *internal_object,
 
         if ((ACPI_GET_DESCRIPTOR_TYPE(internal_object) ==
              ACPI_DESC_TYPE_OPERAND)
-            && (ACPI_GET_OBJECT_TYPE(internal_object) == ACPI_TYPE_PACKAGE)) {
+            && (internal_object->common.type == ACPI_TYPE_PACKAGE)) {
                 status =
                     acpi_ut_get_package_object_size(internal_object,
                                                     obj_length);