ACPICA: Utilities: Update debug output

ACPICA commit 082b5b3ee31f74735e166858eeda025288604a5a

Enhancement of miscellaneous debug output.

Link: https://github.com/acpica/acpica/commit/082b5b3e
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index b3d8421cfb8079b1f3b78b71f43cc4d2bbb63402..c6f2ce17af827657aa9456b43e1699e3c9e5f23e 100644 (file)
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -238,7 +238,7 @@ const char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
 
        if (!obj_desc) {
                ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Null Object Descriptor\n"));
-               return_PTR("[NULL Object Descriptor]");
+               return_STR("[NULL Object Descriptor]");
        }
 
        /* These descriptor types share a common area */
@@ -251,7 +251,7 @@ const char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
                                  acpi_ut_get_descriptor_name(obj_desc),
                                  obj_desc));
 
-               return_PTR("Invalid object");
+               return_STR("Invalid object");
        }
 
        return_STR(acpi_ut_get_type_name(obj_desc->common.type));

diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 529d6c38ea7cea181743b8d9ec1883b303368fa5..5cdd707040e212b68e91131b7530053987c600f8 100644 (file)
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -421,8 +421,10 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
                }
 
                ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                                 "Obj %p Type %.2X Refs %.2X [Incremented]\n",
-                                 object, object->common.type, new_count));
+                                 "Obj %p Type %.2X [%s] Refs %.2X [Incremented]\n",
+                                 object, object->common.type,
+                                 acpi_ut_get_object_type_name(object),
+                                 new_count));
                break;
 
        case REF_DECREMENT: