Commit 7b6afb67 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki

ACPICA: Fix broken call depth tracing logic.

This patch does not affect the generation of the Linux binary.
This patch decreases 26 lines of 20121018 divergence.diff.

The ACPICA uses a call depth tracing mechanism by wrapping the return
statements with return macros and marking the entrance with
ACPI_FUNCTION_TRACE_ macros. There are other ACPI_FUNCTION_ macros used
to mark the functions not using this tracing mechanism.

This patch fixes broken call depth tracing logic.
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9c0d7939
...@@ -329,7 +329,6 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc, ...@@ -329,7 +329,6 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
static u8 static u8
acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value) acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
{ {
ACPI_FUNCTION_NAME(ex_register_overflow);
if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) { if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) {
/* /*
......
...@@ -492,7 +492,7 @@ acpi_walk_namespace(acpi_object_type type, ...@@ -492,7 +492,7 @@ acpi_walk_namespace(acpi_object_type type,
*/ */
status = acpi_ut_acquire_read_lock(&acpi_gbl_namespace_rw_lock); status = acpi_ut_acquire_read_lock(&acpi_gbl_namespace_rw_lock);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
return status; return_ACPI_STATUS(status);
} }
/* /*
...@@ -550,7 +550,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, ...@@ -550,7 +550,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status); return (status);
} }
node = acpi_ns_validate_handle(obj_handle); node = acpi_ns_validate_handle(obj_handle);
......
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