ACPICA: Debugger/acpiexec: Cleanup error messages

ACPICA commit 0d792c25d3bcaa857920ec009b732ec7c8942cfa

Clarify some of the error messages when a method failure happens.

Link: https://github.com/acpica/acpica/commit/0d792c25
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/dbobject.c b/drivers/acpi/acpica/dbobject.c
index f2252b1..e7b415c 100644 (file)
--- a/drivers/acpi/acpica/dbobject.c
+++ b/drivers/acpi/acpica/dbobject.c
@@ -448,7 +448,7 @@ void acpi_db_decode_locals(struct acpi_walk_state *walk_state)
 
        if (display_locals) {
                acpi_os_printf
-                   ("\nInitialized Local Variables for method [%4.4s]:\n",
+                   ("\nInitialized Local Variables for Method [%4.4s]:\n",
                     acpi_ut_get_node_name(node));
 
                for (i = 0; i < ACPI_METHOD_NUM_LOCALS; i++) {
@@ -461,7 +461,7 @@ void acpi_db_decode_locals(struct acpi_walk_state *walk_state)
                }
        } else {
                acpi_os_printf
-                   ("No Local Variables are initialized for method [%4.4s]\n",
+                   ("No Local Variables are initialized for Method [%4.4s]\n",
                     acpi_ut_get_node_name(node));
        }
 }
@@ -515,7 +515,7 @@ void acpi_db_decode_arguments(struct acpi_walk_state *walk_state)
                acpi_os_printf("Initialized Arguments for Method [%4.4s]:  "
                               "(%X arguments defined for method invocation)\n",
                               acpi_ut_get_node_name(node),
-                              obj_desc->method.param_count);
+                              node->object->method.param_count);
 
                for (i = 0; i < ACPI_METHOD_NUM_ARGS; i++) {
                        obj_desc = walk_state->arguments[i].object;

diff --git a/drivers/acpi/acpica/dsdebug.c b/drivers/acpi/acpica/dsdebug.c
index 4d885eb..d1f457e 100644 (file)
--- a/drivers/acpi/acpica/dsdebug.c
+++ b/drivers/acpi/acpica/dsdebug.c
@@ -196,6 +196,7 @@ acpi_ds_dump_method_stack(acpi_status status,
                                op->common.next = NULL;
 
 #ifdef ACPI_DISASSEMBLER
+                               acpi_os_printf("Failed at ");
                                acpi_dm_disassemble(next_walk_state, op,
                                                    ACPI_UINT32_MAX);
 #endif