Skip to content

Commit

Permalink
ACPICA: Debugger/acpiexec: Cleanup error messages
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Jun 12, 2017
1 parent deb85f6 commit 2cb8c3b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/acpi/acpica/dbobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand All @@ -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));
}
}
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions drivers/acpi/acpica/dsdebug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2cb8c3b

Please sign in to comment.