aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/dispatcher/dsmthdat.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2006-01-13 16:22:00 -0500
committerLen Brown <len.brown@intel.com>2006-01-20 02:23:50 -0500
commit4a90c7e86202f46fa9af011bdbcdf36e355d1721 (patch)
tree3784cffb2166330d6f94ea53996fbeef36f58ce3 /drivers/acpi/dispatcher/dsmthdat.c
parent3c5c363826e435cf4d54d917202567e5b57cae5f (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/dsmthdat.c')
-rw-r--r--drivers/acpi/dispatcher/dsmthdat.c28
1 files changed, 9 insertions, 19 deletions
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index 4095ce70982b..ce33c34f87c6 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.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
@@ -260,9 +260,7 @@ acpi_ds_method_data_get_node(u16 opcode,
260 case AML_LOCAL_OP: 260 case AML_LOCAL_OP:
261 261
262 if (index > ACPI_METHOD_MAX_LOCAL) { 262 if (index > ACPI_METHOD_MAX_LOCAL) {
263 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 263 ACPI_REPORT_ERROR(("Local index %d is invalid (max %d)\n", index, ACPI_METHOD_MAX_LOCAL));
264 "Local index %d is invalid (max %d)\n",
265 index, ACPI_METHOD_MAX_LOCAL));
266 return_ACPI_STATUS(AE_AML_INVALID_INDEX); 264 return_ACPI_STATUS(AE_AML_INVALID_INDEX);
267 } 265 }
268 266
@@ -274,9 +272,8 @@ acpi_ds_method_data_get_node(u16 opcode,
274 case AML_ARG_OP: 272 case AML_ARG_OP:
275 273
276 if (index > ACPI_METHOD_MAX_ARG) { 274 if (index > ACPI_METHOD_MAX_ARG) {
277 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 275 ACPI_REPORT_ERROR(("Arg index %d is invalid (max %d)\n",
278 "Arg index %d is invalid (max %d)\n", 276 index, ACPI_METHOD_MAX_ARG));
279 index, ACPI_METHOD_MAX_ARG));
280 return_ACPI_STATUS(AE_AML_INVALID_INDEX); 277 return_ACPI_STATUS(AE_AML_INVALID_INDEX);
281 } 278 }
282 279
@@ -286,8 +283,7 @@ acpi_ds_method_data_get_node(u16 opcode,
286 break; 283 break;
287 284
288 default: 285 default:
289 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Opcode %d is invalid\n", 286 ACPI_REPORT_ERROR(("Opcode %d is invalid\n", opcode));
290 opcode));
291 return_ACPI_STATUS(AE_AML_BAD_OPCODE); 287 return_ACPI_STATUS(AE_AML_BAD_OPCODE);
292 } 288 }
293 289
@@ -378,8 +374,7 @@ acpi_ds_method_data_get_value(u16 opcode,
378 /* Validate the object descriptor */ 374 /* Validate the object descriptor */
379 375
380 if (!dest_desc) { 376 if (!dest_desc) {
381 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 377 ACPI_REPORT_ERROR(("Null object descriptor pointer\n"));
382 "Null object descriptor pointer\n"));
383 return_ACPI_STATUS(AE_BAD_PARAMETER); 378 return_ACPI_STATUS(AE_BAD_PARAMETER);
384 } 379 }
385 380
@@ -424,23 +419,18 @@ acpi_ds_method_data_get_value(u16 opcode,
424 switch (opcode) { 419 switch (opcode) {
425 case AML_ARG_OP: 420 case AML_ARG_OP:
426 421
427 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 422 ACPI_REPORT_ERROR(("Uninitialized Arg[%d] at node %p\n", index, node));
428 "Uninitialized Arg[%d] at node %p\n",
429 index, node));
430 423
431 return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG); 424 return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
432 425
433 case AML_LOCAL_OP: 426 case AML_LOCAL_OP:
434 427
435 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 428 ACPI_REPORT_ERROR(("Uninitialized Local[%d] at node %p\n", index, node));
436 "Uninitialized Local[%d] at node %p\n",
437 index, node));
438 429
439 return_ACPI_STATUS(AE_AML_UNINITIALIZED_LOCAL); 430 return_ACPI_STATUS(AE_AML_UNINITIALIZED_LOCAL);
440 431
441 default: 432 default:
442 ACPI_REPORT_ERROR(("Not Arg/Local opcode: %X\n", 433 ACPI_REPORT_ERROR(("Not a Arg/Local opcode: %X\n", opcode));
443 opcode));
444 return_ACPI_STATUS(AE_AML_INTERNAL); 434 return_ACPI_STATUS(AE_AML_INTERNAL);
445 } 435 }
446 } 436 }