diff options
Diffstat (limited to 'drivers/acpi/acpica/utdebug.c')
| -rw-r--r-- | drivers/acpi/acpica/utdebug.c | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c index 03ae8af..5796e11 100644 --- a/drivers/acpi/acpica/utdebug.c +++ b/drivers/acpi/acpica/utdebug.c @@ -41,8 +41,7 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define EXPORT_ACPI_INTERFACES - +#include <linux/export.h> #include <acpi/acpi.h> #include "accommon.h" @@ -185,30 +184,21 @@ acpi_debug_print(u32 requested_debug_level, } acpi_gbl_prev_thread_id = thread_id; - acpi_gbl_nesting_level = 0; } /* * Display the module name, current line number, thread ID (if requested), * current procedure nesting level, and the current procedure name */ - acpi_os_printf("%9s-%04ld ", module_name, line_number); + acpi_os_printf("%8s-%04ld ", module_name, line_number); -#ifdef ACPI_EXEC_APP - /* - * For acpi_exec only, emit the thread ID and nesting level. - * Note: nesting level is really only useful during a single-thread - * execution. Otherwise, multiple threads will keep resetting the - * level. - */ if (ACPI_LV_THREADS & acpi_dbg_level) { acpi_os_printf("[%u] ", (u32)thread_id); } - acpi_os_printf("[%02ld] ", acpi_gbl_nesting_level); -#endif - - acpi_os_printf("%-22.22s: ", acpi_ut_trim_function_name(function_name)); + acpi_os_printf("[%02ld] %-22.22s: ", + acpi_gbl_nesting_level, + acpi_ut_trim_function_name(function_name)); va_start(args, format); acpi_os_vprintf(format, args); @@ -429,9 +419,7 @@ acpi_ut_exit(u32 line_number, component_id, "%s\n", acpi_gbl_fn_exit_str); } - if (acpi_gbl_nesting_level) { - acpi_gbl_nesting_level--; - } + acpi_gbl_nesting_level--; } ACPI_EXPORT_SYMBOL(acpi_ut_exit) @@ -478,9 +466,7 @@ acpi_ut_status_exit(u32 line_number, } } - if (acpi_gbl_nesting_level) { - acpi_gbl_nesting_level--; - } + acpi_gbl_nesting_level--; } ACPI_EXPORT_SYMBOL(acpi_ut_status_exit) @@ -517,9 +503,7 @@ acpi_ut_value_exit(u32 line_number, ACPI_FORMAT_UINT64(value)); } - if (acpi_gbl_nesting_level) { - acpi_gbl_nesting_level--; - } + acpi_gbl_nesting_level--; } ACPI_EXPORT_SYMBOL(acpi_ut_value_exit) @@ -555,9 +539,7 @@ acpi_ut_ptr_exit(u32 line_number, ptr); } - if (acpi_gbl_nesting_level) { - acpi_gbl_nesting_level--; - } + acpi_gbl_nesting_level--; } #endif |