Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 407e22af authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: OSL: Add configurability for error message functions. 



This patch extends ACPI_HW_DEPENDENT_x mechanism to all error message
related functions so that the OSPMs can have full control to configure them
into stub functions.

This patch doesn't include code for Linux to use this new mechanism, thus
no functional change.  Lv Zheng.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d5caf1cd

drivers/acpi/acpica/utxferror.c

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ ACPI_MODULE_NAME("utxferror") 
 * This module is used for the in-kernel ACPICA as well as the ACPICA

 * tools/applications.

 */

#ifndef ACPI_NO_ERROR_MESSAGES	/* Entire module */

/*******************************************************************************

 *

 * FUNCTION:    acpi_error
@@ -249,3 +250,4 @@ acpi_bios_warning(const char *module_name, 
}



ACPI_EXPORT_SYMBOL(acpi_bios_warning)

#endif				/* ACPI_NO_ERROR_MESSAGES */

include/acpi/acpixf.h

+46 −27
Original line number Diff line number Diff line
@@ -240,6 +240,21 @@ ACPI_GLOBAL(u8, acpi_gbl_system_awake_and_running); 


#endif				/* !ACPI_REDUCED_HARDWARE */



/*

 * Error-message prototypes. All interfaces that use these macros will

 * be configured out of the ACPICA build if the ACPI_NO_ERROR_MESSAGE flag

 * is defined.

 */

#ifndef ACPI_NO_ERROR_MESSAGES

#define ACPI_MSG_DEPENDENT_RETURN_VOID(prototype) \

	prototype;



#else

#define ACPI_MSG_DEPENDENT_RETURN_VOID(prototype) \

	static ACPI_INLINE prototype {return;}



#endif				/* ACPI_NO_ERROR_MESSAGES */



/*

 * Initialization

 */
@@ -666,38 +681,42 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
/*

 * Error/Warning output

 */

ACPI_PRINTF_LIKE(3)

ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)

			       void ACPI_INTERNAL_VAR_XFACE

acpi_error(const char *module_name, u32 line_number, const char *format, ...);



ACPI_PRINTF_LIKE(4)

			       acpi_error(const char *module_name,

					  u32 line_number,

					  const char *format, ...))

ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(4)

				void ACPI_INTERNAL_VAR_XFACE

				acpi_exception(const char *module_name,

	       u32 line_number, acpi_status status, const char *format, ...);



ACPI_PRINTF_LIKE(3)

					       u32 line_number,

					       acpi_status status,

					       const char *format, ...))

ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)

				void ACPI_INTERNAL_VAR_XFACE

acpi_warning(const char *module_name, u32 line_number, const char *format, ...);



ACPI_PRINTF_LIKE(3)

				acpi_warning(const char *module_name,

					     u32 line_number,

					     const char *format, ...))

ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)

				void ACPI_INTERNAL_VAR_XFACE

acpi_info(const char *module_name, u32 line_number, const char *format, ...);



ACPI_PRINTF_LIKE(3)

				acpi_info(const char *module_name,

					  u32 line_number,

					  const char *format, ...))

ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)

				void ACPI_INTERNAL_VAR_XFACE

				acpi_bios_error(const char *module_name,

		u32 line_number, const char *format, ...);



ACPI_PRINTF_LIKE(3)

						u32 line_number,

						const char *format, ...))

ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)

				void ACPI_INTERNAL_VAR_XFACE

				acpi_bios_warning(const char *module_name,

		  u32 line_number, const char *format, ...);

						  u32 line_number,

						  const char *format, ...))



/*

 * Debug output

 */

#ifdef ACPI_DEBUG_OUTPUT



ACPI_PRINTF_LIKE(6)

void ACPI_INTERNAL_VAR_XFACE

acpi_debug_print(u32 requested_debug_level,