ACPICA: Update for a few debug output statements

ACPICA commit 900e96a9c6c6d67c2e18e8c2576dc4742221fc71

Implement a very small indent for trace output.

Link: https://github.com/acpica/acpica/commit/900e96a9
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index 83398dc4b7c288fbe8ecac3b98f3b5bb55efefc5..ccdd2a417aa15b91af90dd587f9adca7244281cf 100644 (file)
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -904,7 +904,7 @@ void
 acpi_ex_dump_operands(union acpi_operand_object **operands,
                      const char *opcode_name, u32 num_operands)
 {
-       ACPI_FUNCTION_NAME(ex_dump_operands);
+       ACPI_FUNCTION_TRACE(ex_dump_operands);
 
        if (!opcode_name) {
                opcode_name = "UNKNOWN";
@@ -928,7 +928,7 @@ acpi_ex_dump_operands(union acpi_operand_object **operands,
 
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                          "**** End operand dump for [%s]\n", opcode_name));
-       return;
+       return_VOID;
 }
 
 /*******************************************************************************

diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index 615a885e2ca3c6fc276d5eae53793242adbf56b8..77d8c9054b8eceec5576a2dc1c0953cc1152d5f4 100644 (file)
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -163,6 +163,7 @@ acpi_debug_print(u32 requested_debug_level,
 {
        acpi_thread_id thread_id;
        va_list args;
+       int fill_count;
 
        /* Check if debug output enabled */
 
@@ -202,10 +203,21 @@ acpi_debug_print(u32 requested_debug_level,
                acpi_os_printf("[%u] ", (u32)thread_id);
        }
 
-       acpi_os_printf("[%02ld] ", acpi_gbl_nesting_level);
-#endif
+       fill_count = 48 - acpi_gbl_nesting_level -
+           strlen(acpi_ut_trim_function_name(function_name));
+       if (fill_count < 0) {
+               fill_count = 0;
+       }
 
+       acpi_os_printf("[%02ld] %*s",
+                      acpi_gbl_nesting_level, acpi_gbl_nesting_level, " ");
+       acpi_os_printf("%s%*s: ",
+                      acpi_ut_trim_function_name(function_name), fill_count,
+                      " ");
+
+#else
        acpi_os_printf("%-22.22s: ", acpi_ut_trim_function_name(function_name));
+#endif
 
        va_start(args, format);
        acpi_os_vprintf(format, args);