Commit b74be611 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Update error/warning interfaces 



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

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 59a3759d

drivers/acpi/acpica/utmisc.c

+9 −11
Original line number Diff line number Diff line
@@ -1033,11 +1033,12 @@ acpi_error(const char *module_name, u32 line_number, const char *format, ...) 
{

	va_list args;



	acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);

	acpi_os_printf("ACPI Error: ");



	va_start(args, format);

	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);

}
@@ -1047,12 +1048,12 @@ acpi_exception(const char *module_name, 
{

	va_list args;



	acpi_os_printf("ACPI Exception (%s-%04d): %s, ", module_name,

		       line_number, acpi_format_exception(status));

	acpi_os_printf("ACPI Exception: %s, ", acpi_format_exception(status));



	va_start(args, format);

	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);

}
@@ -1061,11 +1062,12 @@ acpi_warning(const char *module_name, u32 line_number, const char *format, ...) 
{

	va_list args;



	acpi_os_printf("ACPI Warning (%s-%04d): ", module_name, line_number);

	acpi_os_printf("ACPI Warning: ");



	va_start(args, format);

	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);

}
@@ -1074,10 +1076,6 @@ acpi_info(const char *module_name, u32 line_number, const char *format, ...) 
{

	va_list args;



	/*

	 * Removed module_name, line_number, and acpica version, not needed

	 * for info output

	 */

	acpi_os_printf("ACPI: ");



	va_start(args, format);

include/acpi/acpixf.h

+4 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state); 
acpi_status acpi_leave_sleep_state(u8 sleep_state);



/*

 * Debug output

 * Error/Warning output

 */

void ACPI_INTERNAL_VAR_XFACE

acpi_error(const char *module_name,
@@ -394,6 +394,9 @@ void ACPI_INTERNAL_VAR_XFACE 
acpi_info(const char *module_name,

	  u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);



/*

 * Debug output

 */

#ifdef ACPI_DEBUG_OUTPUT



void ACPI_INTERNAL_VAR_XFACE