diff options
author | Bob Moore <robert.moore@intel.com> | 2006-01-13 16:22:00 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-20 02:23:50 -0500 |
commit | 4a90c7e86202f46fa9af011bdbcdf36e355d1721 (patch) | |
tree | 3784cffb2166330d6f94ea53996fbeef36f58ce3 /drivers/acpi/dispatcher/dsutils.c | |
parent | 3c5c363826e435cf4d54d917202567e5b57cae5f (diff) |
[ACPI] ACPICA 20060113
Added 2006 copyright.
At SuSE's suggestion, enabled all error messages
without enabling function tracing, ie with CONFIG_ACPI_DEBUG=n
Replaced all instances of the ACPI_DEBUG_PRINT macro invoked at
the ACPI_DB_ERROR and ACPI_DB_WARN debug levels with
the ACPI_REPORT_ERROR and ACPI_REPORT_WARNING macros,
respectively. This preserves all error and warning messages
in the non-debug version of the ACPICA code (this has been
referred to as the "debug lite" option.) Over 200 cases
were converted to create a total of over 380 error/warning
messages across the ACPICA code. This increases the code
and data size of the default non-debug version by about 13K.
Added ACPI_NO_ERROR_MESSAGES flag to enable deleting all messages.
The size of the debug version remains about the same.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/dispatcher/dsutils.c')
-rw-r--r-- | drivers/acpi/dispatcher/dsutils.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c index 2cc53da5c0bd..cd9aa7faa57b 100644 --- a/drivers/acpi/dispatcher/dsutils.c +++ b/drivers/acpi/dispatcher/dsutils.c | |||
@@ -5,7 +5,7 @@ | |||
5 | ******************************************************************************/ | 5 | ******************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2005, R. Byron Moore | 8 | * Copyright (C) 2000 - 2006, R. Byron Moore |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -176,7 +176,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, | |||
176 | /* Must have both an Op and a Result Object */ | 176 | /* Must have both an Op and a Result Object */ |
177 | 177 | ||
178 | if (!op) { | 178 | if (!op) { |
179 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null Op\n")); | 179 | ACPI_REPORT_ERROR(("Null Op\n")); |
180 | return_UINT8(TRUE); | 180 | return_UINT8(TRUE); |
181 | } | 181 | } |
182 | 182 | ||
@@ -216,8 +216,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, | |||
216 | parent_info = | 216 | parent_info = |
217 | acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode); | 217 | acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode); |
218 | if (parent_info->class == AML_CLASS_UNKNOWN) { | 218 | if (parent_info->class == AML_CLASS_UNKNOWN) { |
219 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 219 | ACPI_REPORT_ERROR(("Unknown parent opcode Op=%p\n", op)); |
220 | "Unknown parent opcode. Op=%p\n", op)); | ||
221 | return_UINT8(FALSE); | 220 | return_UINT8(FALSE); |
222 | } | 221 | } |
223 | 222 | ||
@@ -344,7 +343,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op, | |||
344 | ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj); | 343 | ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj); |
345 | 344 | ||
346 | if (!op) { | 345 | if (!op) { |
347 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null Op\n")); | 346 | ACPI_REPORT_ERROR(("Null Op\n")); |
348 | return_VOID; | 347 | return_VOID; |
349 | } | 348 | } |
350 | 349 | ||
@@ -635,10 +634,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state, | |||
635 | * Only error is underflow, and this indicates | 634 | * Only error is underflow, and this indicates |
636 | * a missing or null operand! | 635 | * a missing or null operand! |
637 | */ | 636 | */ |
638 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 637 | ACPI_REPORT_ERROR(("Missing or null operand, %s\n", acpi_format_exception(status))); |
639 | "Missing or null operand, %s\n", | ||
640 | acpi_format_exception | ||
641 | (status))); | ||
642 | return_ACPI_STATUS(status); | 638 | return_ACPI_STATUS(status); |
643 | } | 639 | } |
644 | } else { | 640 | } else { |
@@ -730,7 +726,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state, | |||
730 | */ | 726 | */ |
731 | (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state); | 727 | (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state); |
732 | 728 | ||
733 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "While creating Arg %d - %s\n", | 729 | ACPI_REPORT_ERROR(("While creating Arg %d - %s\n", |
734 | (arg_count + 1), acpi_format_exception(status))); | 730 | (arg_count + 1), acpi_format_exception(status))); |
735 | return_ACPI_STATUS(status); | 731 | return_ACPI_STATUS(status); |
736 | } | 732 | } |