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/parser/psloop.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/parser/psloop.c')
-rw-r--r-- | drivers/acpi/parser/psloop.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c index e81e51b8b3ae..c66029b890b1 100644 --- a/drivers/acpi/parser/psloop.c +++ b/drivers/acpi/parser/psloop.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 |
@@ -123,16 +123,10 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) | |||
123 | && ((status & AE_CODE_MASK) != | 123 | && ((status & AE_CODE_MASK) != |
124 | AE_CODE_CONTROL)) { | 124 | AE_CODE_CONTROL)) { |
125 | if (status == AE_AML_NO_RETURN_VALUE) { | 125 | if (status == AE_AML_NO_RETURN_VALUE) { |
126 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 126 | ACPI_REPORT_ERROR(("Invoked method did not return a value, %s\n", acpi_format_exception(status))); |
127 | "Invoked method did not return a value, %s\n", | ||
128 | acpi_format_exception | ||
129 | (status))); | ||
130 | 127 | ||
131 | } | 128 | } |
132 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 129 | ACPI_REPORT_ERROR(("get_predicate Failed, %s\n", acpi_format_exception(status))); |
133 | "get_predicate Failed, %s\n", | ||
134 | acpi_format_exception | ||
135 | (status))); | ||
136 | return_ACPI_STATUS(status); | 130 | return_ACPI_STATUS(status); |
137 | } | 131 | } |
138 | 132 | ||
@@ -190,11 +184,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) | |||
190 | 184 | ||
191 | /* The opcode is unrecognized. Just skip unknown opcodes */ | 185 | /* The opcode is unrecognized. Just skip unknown opcodes */ |
192 | 186 | ||
193 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 187 | ACPI_REPORT_ERROR(("Found unknown opcode %X at AML address %p offset %X, ignoring\n", walk_state->opcode, parser_state->aml, walk_state->aml_offset)); |
194 | "Found unknown opcode %X at AML address %p offset %X, ignoring\n", | ||
195 | walk_state->opcode, | ||
196 | parser_state->aml, | ||
197 | walk_state->aml_offset)); | ||
198 | 188 | ||
199 | ACPI_DUMP_BUFFER(parser_state->aml, 128); | 189 | ACPI_DUMP_BUFFER(parser_state->aml, 128); |
200 | 190 | ||
@@ -281,10 +271,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) | |||
281 | walk_state->descending_callback(walk_state, | 271 | walk_state->descending_callback(walk_state, |
282 | &op); | 272 | &op); |
283 | if (ACPI_FAILURE(status)) { | 273 | if (ACPI_FAILURE(status)) { |
284 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 274 | ACPI_REPORT_ERROR(("During name lookup/catalog, %s\n", acpi_format_exception(status))); |
285 | "During name lookup/catalog, %s\n", | ||
286 | acpi_format_exception | ||
287 | (status))); | ||
288 | goto close_this_op; | 275 | goto close_this_op; |
289 | } | 276 | } |
290 | 277 | ||