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/utilities/uteval.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/utilities/uteval.c')
-rw-r--r-- | drivers/acpi/utilities/uteval.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c index cd63a2d93fe3..f4dc374a0eec 100644 --- a/drivers/acpi/utilities/uteval.c +++ b/drivers/acpi/utilities/uteval.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 |
@@ -154,8 +154,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node, | |||
154 | acpi_ut_get_node_name(prefix_node), | 154 | acpi_ut_get_node_name(prefix_node), |
155 | path)); | 155 | path)); |
156 | } else { | 156 | } else { |
157 | ACPI_REPORT_METHOD_ERROR("Method execution failed", | 157 | ACPI_REPORT_MTERROR("Method execution failed", |
158 | prefix_node, path, status); | 158 | prefix_node, path, status); |
159 | } | 159 | } |
160 | 160 | ||
161 | return_ACPI_STATUS(status); | 161 | return_ACPI_STATUS(status); |
@@ -165,9 +165,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node, | |||
165 | 165 | ||
166 | if (!info.return_object) { | 166 | if (!info.return_object) { |
167 | if (expected_return_btypes) { | 167 | if (expected_return_btypes) { |
168 | ACPI_REPORT_METHOD_ERROR("No object was returned from", | 168 | ACPI_REPORT_MTERROR("No object was returned from", |
169 | prefix_node, path, | 169 | prefix_node, path, AE_NOT_EXIST); |
170 | AE_NOT_EXIST); | ||
171 | 170 | ||
172 | return_ACPI_STATUS(AE_NOT_EXIST); | 171 | return_ACPI_STATUS(AE_NOT_EXIST); |
173 | } | 172 | } |
@@ -212,15 +211,10 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node, | |||
212 | /* Is the return object one of the expected types? */ | 211 | /* Is the return object one of the expected types? */ |
213 | 212 | ||
214 | if (!(expected_return_btypes & return_btype)) { | 213 | if (!(expected_return_btypes & return_btype)) { |
215 | ACPI_REPORT_METHOD_ERROR("Return object type is incorrect", | 214 | ACPI_REPORT_MTERROR("Return object type is incorrect", |
216 | prefix_node, path, AE_TYPE); | 215 | prefix_node, path, AE_TYPE); |
217 | 216 | ||
218 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 217 | ACPI_REPORT_ERROR(("Type returned from %s was incorrect: %s, expected Btypes: %X\n", path, acpi_ut_get_object_type_name(info.return_object), expected_return_btypes)); |
219 | "Type returned from %s was incorrect: %s, expected Btypes: %X\n", | ||
220 | path, | ||
221 | acpi_ut_get_object_type_name(info. | ||
222 | return_object), | ||
223 | expected_return_btypes)); | ||
224 | 218 | ||
225 | /* On error exit, we must delete the return object */ | 219 | /* On error exit, we must delete the return object */ |
226 | 220 | ||