lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPICA: Update error/warning interfaces

Browse Source 
Moved the module name and line number to the end of the message.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bob Moore
2009-04-22 10:20:23 +08:00
committed by Len Brown
parent 59a3759d0f
commit b74be6119e
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/acpi/acpica/utmisc.c
View File

@@ -1033,11 +1033,12 @@ acpi_error(const char *module_name, u32 line_number, const char *format, ...)
{ {
va_list args; va_list args;
acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number); acpi_os_printf("ACPI Error: ");
va_start(args, format); va_start(args, format);
acpi_os_vprintf(format, args); acpi_os_vprintf(format, args);
acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); acpi_os_printf(" %8.8X %s-%u\n", ACPI_CA_VERSION, module_name,
line_number);
va_end(args); va_end(args);
} }
@@ -1047,12 +1048,12 @@ acpi_exception(const char *module_name,
{ {
va_list args; va_list args;
acpi_os_printf("ACPI Exception (%s-%04d): %s, ", module_name, acpi_os_printf("ACPI Exception: %s, ", acpi_format_exception(status));
line_number, acpi_format_exception(status));
va_start(args, format); va_start(args, format);
acpi_os_vprintf(format, args); acpi_os_vprintf(format, args);
acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); acpi_os_printf(" %8.8X %s-%u\n", ACPI_CA_VERSION, module_name,
line_number);
va_end(args); va_end(args);
} }
@@ -1061,11 +1062,12 @@ acpi_warning(const char *module_name, u32 line_number, const char *format, ...)
{ {
va_list args; va_list args;
acpi_os_printf("ACPI Warning (%s-%04d): ", module_name, line_number); acpi_os_printf("ACPI Warning: ");
va_start(args, format); va_start(args, format);
acpi_os_vprintf(format, args); acpi_os_vprintf(format, args);
acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); acpi_os_printf(" %8.8X %s-%u\n", ACPI_CA_VERSION, module_name,
line_number);
va_end(args); va_end(args);
} }
@@ -1074,10 +1076,6 @@ acpi_info(const char *module_name, u32 line_number, const char *format, ...)
{ {
va_list args; va_list args;
/*
* Removed module_name, line_number, and acpica version, not needed
* for info output
*/
acpi_os_printf("ACPI: "); acpi_os_printf("ACPI: ");
va_start(args, format); va_start(args, format);

5
include/acpi/acpixf.h
View File

@@ -375,7 +375,7 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state);
acpi_status acpi_leave_sleep_state(u8 sleep_state); acpi_status acpi_leave_sleep_state(u8 sleep_state);
/* /*
* Debug output * Error/Warning output
*/ */
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_error(const char *module_name, acpi_error(const char *module_name,
@@ -394,6 +394,9 @@ void ACPI_INTERNAL_VAR_XFACE
acpi_info(const char *module_name, acpi_info(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3); u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
/*
* Debug output
*/
#ifdef ACPI_DEBUG_OUTPUT #ifdef ACPI_DEBUG_OUTPUT
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE