diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-01 03:26:26 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-01 03:26:26 +0100 |
| commit | b17629dbf72d0718e88190d7f0a1d54be044799c (patch) | |
| tree | 90e1908b4c7eab87989b17341cdaa8d074e355b2 /drivers/acpi/acpica/dswexec.c | |
| parent | 74bf8efb5fa6e958d2d7c7917b8bb672085ec0c6 (diff) | |
| parent | 59adb3988ebeec012343317ac783d6a7935e0c83 (diff) | |
Merge branch 'acpi-debug' into acpica
Diffstat (limited to 'drivers/acpi/acpica/dswexec.c')
| -rw-r--r-- | drivers/acpi/acpica/dswexec.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c index df54d46225cd..9cc5761ef483 100644 --- a/drivers/acpi/acpica/dswexec.c +++ b/drivers/acpi/acpica/dswexec.c @@ -178,8 +178,7 @@ cleanup: /* Break to debugger to display result */ - ACPI_DEBUGGER_EXEC(acpi_db_display_result_object - (local_obj_desc, walk_state)); + acpi_db_display_result_object(local_obj_desc, walk_state); /* * Delete the predicate result object (we know that @@ -386,11 +385,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) /* Call debugger for single step support (DEBUG build only) */ - ACPI_DEBUGGER_EXEC(status = - acpi_db_single_step(walk_state, op, op_class)); - ACPI_DEBUGGER_EXEC(if (ACPI_FAILURE(status)) { - return_ACPI_STATUS(status);} - ) ; + status = acpi_db_single_step(walk_state, op, op_class); + if (ACPI_FAILURE(status)) { + return_ACPI_STATUS(status); + } /* Decode the Opcode Class */ @@ -728,8 +726,8 @@ cleanup: /* Break to debugger to display result */ - ACPI_DEBUGGER_EXEC(acpi_db_display_result_object - (walk_state->result_obj, walk_state)); + acpi_db_display_result_object(walk_state->result_obj, + walk_state); /* * Delete the result op if and only if: |