Commit 4506bf23 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki

ACPICA: Prevent possible build issues for use of ACPI_PRINTF_LIKE macro

The following build error:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   CC      arch/x86/kernel/setup.o
 In file included from include/acpi/acpi.h:64:0,
                  from include/linux/iscsi_ibft.h:24,
                  from arch/x86/kernel/setup.c:43:
 include/acpi/acpixf.h:543:1: error: expected ',' or ';' before '{' token
 include/acpi/acpixf.h:540:1: warning: 'acpi_error' declared 'static' but never defined [-Wunused-function]
 make[2]: *** [arch/x86/kernel/setup.o] Error 1
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
can be triggerred by the following stub function (if implemented):
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 static inline void ACPI_INTERNAL_VAR_XFACE
 acpi_error(const char *module_name,
 	   u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3)
 {
 }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This patch changes the position of ACPI_PRINTF_LIKE(x) to follow the
style of __printf(x, x+1) used in Linux to prevent such issues from
happening.  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 d21f600b
...@@ -530,50 +530,53 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status ...@@ -530,50 +530,53 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
/* /*
* Error/Warning output * Error/Warning output
*/ */
ACPI_PRINTF_LIKE(3)
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_error(const char *module_name, acpi_error(const char *module_name, u32 line_number, const char *format, ...);
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
ACPI_PRINTF_LIKE(4)
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_exception(const char *module_name, acpi_exception(const char *module_name,
u32 line_number, u32 line_number, acpi_status status, const char *format, ...);
acpi_status status, const char *format, ...) ACPI_PRINTF_LIKE(4);
ACPI_PRINTF_LIKE(3)
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_warning(const char *module_name, acpi_warning(const char *module_name, u32 line_number, const char *format, ...);
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
ACPI_PRINTF_LIKE(3)
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_info(const char *module_name, acpi_info(const char *module_name, u32 line_number, const char *format, ...);
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
ACPI_PRINTF_LIKE(3)
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_bios_error(const char *module_name, acpi_bios_error(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3); u32 line_number, const char *format, ...);
ACPI_PRINTF_LIKE(3)
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_bios_warning(const char *module_name, acpi_bios_warning(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3); u32 line_number, const char *format, ...);
/* /*
* Debug output * Debug output
*/ */
#ifdef ACPI_DEBUG_OUTPUT #ifdef ACPI_DEBUG_OUTPUT
ACPI_PRINTF_LIKE(6)
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_debug_print(u32 requested_debug_level, acpi_debug_print(u32 requested_debug_level,
u32 line_number, u32 line_number,
const char *function_name, const char *function_name,
const char *module_name, const char *module_name,
u32 component_id, const char *format, ...) ACPI_PRINTF_LIKE(6); u32 component_id, const char *format, ...);
ACPI_PRINTF_LIKE(6)
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_debug_print_raw(u32 requested_debug_level, acpi_debug_print_raw(u32 requested_debug_level,
u32 line_number, u32 line_number,
const char *function_name, const char *function_name,
const char *module_name, const char *module_name,
u32 component_id, u32 component_id, const char *format, ...);
const char *format, ...) ACPI_PRINTF_LIKE(6);
#endif #endif
#endif /* __ACXFACE_H__ */ #endif /* __ACXFACE_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment