aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

ACPICA: Fix deconstification warnings (-Wcast-qual) with function traces.

Browse Source 
ACPICA commit f722da0372261331b74d3ac67645bba912a21643

Link: https://github.com/acpica/acpica/commit/f722da03
Signed-off-by: Jung-uk Kim <jkim@FreeBSD.org>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Jung-uk Kim
2016-08-04 16:42:19 +08:00
committed by Rafael J. Wysocki
parent 29b4817d40
commit 4857a94de1
4 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/acpica/acutils.h
View File

@@ -317,6 +317,11 @@ acpi_ut_ptr_exit(u32 line_number,
const char *function_name, const char *function_name,
const char *module_name, u32 component_id, u8 *ptr); const char *module_name, u32 component_id, u8 *ptr);
void
acpi_ut_str_exit(u32 line_number,
const char *function_name,
const char *module_name, u32 component_id, const char *string);
void void
acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id); acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id);

37
drivers/acpi/acpica/utdebug.c
View File

@@ -560,6 +560,43 @@ acpi_ut_ptr_exit(u32 line_number,
} }
} }
/*******************************************************************************
*
* FUNCTION: acpi_ut_str_exit
*
* PARAMETERS: line_number - Caller's line number
* function_name - Caller's procedure name
* module_name - Caller's module name
* component_id - Caller's component ID
* string - String to display
*
* RETURN: None
*
* DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
* set in debug_level. Prints exit value also.
*
******************************************************************************/
void
acpi_ut_str_exit(u32 line_number,
const char *function_name,
const char *module_name, u32 component_id, const char *string)
{
/* Check if enabled up-front for performance */
if (ACPI_IS_DEBUG_ENABLED(ACPI_LV_FUNCTIONS, component_id)) {
acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name,
component_id, "%s %s\n",
acpi_gbl_function_exit_prefix, string);
}
if (acpi_gbl_nesting_level) {
acpi_gbl_nesting_level--;
}
}
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_trace_point * FUNCTION: acpi_trace_point

2
drivers/acpi/acpica/utdecode.c
View File

@@ -253,7 +253,7 @@ const char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
return_PTR("Invalid object"); return_PTR("Invalid object");
} }
return_PTR(acpi_ut_get_type_name(obj_desc->common.type)); return_STR(acpi_ut_get_type_name(obj_desc->common.type));
} }
/******************************************************************************* /*******************************************************************************

6
include/acpi/acoutput.h
View File

@@ -366,7 +366,7 @@
ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, u32, value) ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, u32, value)
#define ACPI_FUNCTION_TRACE_STR(name, string) \ #define ACPI_FUNCTION_TRACE_STR(name, string) \
ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, char *, string) ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, const char *, string)
#define ACPI_FUNCTION_ENTRY() \ #define ACPI_FUNCTION_ENTRY() \
acpi_ut_track_stack_ptr() acpi_ut_track_stack_ptr()
@@ -425,6 +425,9 @@
#define return_PTR(pointer) \ #define return_PTR(pointer) \
ACPI_TRACE_EXIT (acpi_ut_ptr_exit, void *, pointer) ACPI_TRACE_EXIT (acpi_ut_ptr_exit, void *, pointer)
#define return_STR(string) \
ACPI_TRACE_EXIT (acpi_ut_str_exit, const char *, string)
#define return_VALUE(value) \ #define return_VALUE(value) \
ACPI_TRACE_EXIT (acpi_ut_value_exit, u64, value) ACPI_TRACE_EXIT (acpi_ut_value_exit, u64, value)
@@ -478,6 +481,7 @@
#define return_VOID return #define return_VOID return
#define return_ACPI_STATUS(s) return(s) #define return_ACPI_STATUS(s) return(s)
#define return_PTR(s) return(s) #define return_PTR(s) return(s)
#define return_STR(s) return(s)
#define return_VALUE(s) return(s) #define return_VALUE(s) return(s)
#define return_UINT8(s) return(s) #define return_UINT8(s) return(s)
#define return_UINT32(s) return(s) #define return_UINT32(s) return(s)