aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/dispatcher/dsfield.c9
-rw-r--r--drivers/acpi/dispatcher/dsinit.c20
-rw-r--r--drivers/acpi/dispatcher/dsmethod.c2
-rw-r--r--drivers/acpi/dispatcher/dsmthdat.c28
-rw-r--r--drivers/acpi/dispatcher/dsobject.c21
-rw-r--r--drivers/acpi/dispatcher/dsopcode.c41
-rw-r--r--drivers/acpi/dispatcher/dsutils.c18
-rw-r--r--drivers/acpi/dispatcher/dswexec.c36
-rw-r--r--drivers/acpi/dispatcher/dswload.c2
-rw-r--r--drivers/acpi/dispatcher/dswscope.c6
-rw-r--r--drivers/acpi/dispatcher/dswstate.c106
-rw-r--r--drivers/acpi/events/evevent.c4
-rw-r--r--drivers/acpi/events/evgpe.c20
-rw-r--r--drivers/acpi/events/evgpeblk.c20
-rw-r--r--drivers/acpi/events/evmisc.c12
-rw-r--r--drivers/acpi/events/evregion.c45
-rw-r--r--drivers/acpi/events/evrgnini.c2
-rw-r--r--drivers/acpi/events/evsci.c2
-rw-r--r--drivers/acpi/events/evxface.c13
-rw-r--r--drivers/acpi/events/evxfevnt.c23
-rw-r--r--drivers/acpi/events/evxfregn.c2
-rw-r--r--drivers/acpi/executer/exconfig.c6
-rw-r--r--drivers/acpi/executer/exconvrt.c15
-rw-r--r--drivers/acpi/executer/excreate.c2
-rw-r--r--drivers/acpi/executer/exdump.c2
-rw-r--r--drivers/acpi/executer/exfield.c2
-rw-r--r--drivers/acpi/executer/exfldio.c60
-rw-r--r--drivers/acpi/executer/exmisc.c12
-rw-r--r--drivers/acpi/executer/exmutex.c2
-rw-r--r--drivers/acpi/executer/exnames.c16
-rw-r--r--drivers/acpi/executer/exoparg1.c59
-rw-r--r--drivers/acpi/executer/exoparg2.c28
-rw-r--r--drivers/acpi/executer/exoparg3.c8
-rw-r--r--drivers/acpi/executer/exoparg6.c13
-rw-r--r--drivers/acpi/executer/exprep.c11
-rw-r--r--drivers/acpi/executer/exregion.c12
-rw-r--r--drivers/acpi/executer/exresnte.c50
-rw-r--r--drivers/acpi/executer/exresolv.c28
-rw-r--r--drivers/acpi/executer/exresop.c89
-rw-r--r--drivers/acpi/executer/exstore.c19
-rw-r--r--drivers/acpi/executer/exstoren.c13
-rw-r--r--drivers/acpi/executer/exstorob.c2
-rw-r--r--drivers/acpi/executer/exsystem.c4
-rw-r--r--drivers/acpi/executer/exutils.c6
-rw-r--r--drivers/acpi/hardware/hwacpi.c7
-rw-r--r--drivers/acpi/hardware/hwgpe.c2
-rw-r--r--drivers/acpi/hardware/hwregs.c29
-rw-r--r--drivers/acpi/hardware/hwsleep.c2
-rw-r--r--drivers/acpi/hardware/hwtimer.c2
-rw-r--r--drivers/acpi/namespace/nsaccess.c18
-rw-r--r--drivers/acpi/namespace/nsalloc.c7
-rw-r--r--drivers/acpi/namespace/nsdump.c5
-rw-r--r--drivers/acpi/namespace/nsdumpdv.c2
-rw-r--r--drivers/acpi/namespace/nseval.c5
-rw-r--r--drivers/acpi/namespace/nsinit.c22
-rw-r--r--drivers/acpi/namespace/nsload.c6
-rw-r--r--drivers/acpi/namespace/nsnames.c10
-rw-r--r--drivers/acpi/namespace/nsobject.c10
-rw-r--r--drivers/acpi/namespace/nsparse.c2
-rw-r--r--drivers/acpi/namespace/nssearch.c11
-rw-r--r--drivers/acpi/namespace/nsutils.c29
-rw-r--r--drivers/acpi/namespace/nswalk.c2
-rw-r--r--drivers/acpi/namespace/nsxfeval.c21
-rw-r--r--drivers/acpi/namespace/nsxfname.c2
-rw-r--r--drivers/acpi/namespace/nsxfobj.c2
-rw-r--r--drivers/acpi/parser/psargs.c4
-rw-r--r--drivers/acpi/parser/psloop.c23
-rw-r--r--drivers/acpi/parser/psopcode.c4
-rw-r--r--drivers/acpi/parser/psparse.c8
-rw-r--r--drivers/acpi/parser/psscope.c2
-rw-r--r--drivers/acpi/parser/pstree.c5
-rw-r--r--drivers/acpi/parser/psutils.c2
-rw-r--r--drivers/acpi/parser/pswalk.c2
-rw-r--r--drivers/acpi/parser/psxface.c2
-rw-r--r--drivers/acpi/resources/rsaddr.c2
-rw-r--r--drivers/acpi/resources/rscalc.c2
-rw-r--r--drivers/acpi/resources/rscreate.c42
-rw-r--r--drivers/acpi/resources/rsdump.c2
-rw-r--r--drivers/acpi/resources/rsinfo.c2
-rw-r--r--drivers/acpi/resources/rsio.c2
-rw-r--r--drivers/acpi/resources/rsirq.c2
-rw-r--r--drivers/acpi/resources/rslist.c6
-rw-r--r--drivers/acpi/resources/rsmemory.c2
-rw-r--r--drivers/acpi/resources/rsmisc.c9
-rw-r--r--drivers/acpi/resources/rsutils.c2
-rw-r--r--drivers/acpi/resources/rsxface.c2
-rw-r--r--drivers/acpi/tables/tbconvrt.c2
-rw-r--r--drivers/acpi/tables/tbget.c6
-rw-r--r--drivers/acpi/tables/tbgetall.c2
-rw-r--r--drivers/acpi/tables/tbinstal.c2
-rw-r--r--drivers/acpi/tables/tbrsdt.c18
-rw-r--r--drivers/acpi/tables/tbutils.c22
-rw-r--r--drivers/acpi/tables/tbxface.c17
-rw-r--r--drivers/acpi/tables/tbxfroot.c22
-rw-r--r--drivers/acpi/utilities/utalloc.c32
-rw-r--r--drivers/acpi/utilities/utcache.c2
-rw-r--r--drivers/acpi/utilities/utcopy.c7
-rw-r--r--drivers/acpi/utilities/utdebug.c2
-rw-r--r--drivers/acpi/utilities/utdelete.c9
-rw-r--r--drivers/acpi/utilities/uteval.c24
-rw-r--r--drivers/acpi/utilities/utglobal.c21
-rw-r--r--drivers/acpi/utilities/utinit.c7
-rw-r--r--drivers/acpi/utilities/utmath.c10
-rw-r--r--drivers/acpi/utilities/utmisc.c18
-rw-r--r--drivers/acpi/utilities/utmutex.c37
-rw-r--r--drivers/acpi/utilities/utobject.c28
-rw-r--r--drivers/acpi/utilities/utresrc.c2
-rw-r--r--drivers/acpi/utilities/utstate.c2
-rw-r--r--drivers/acpi/utilities/utxface.c7
-rw-r--r--include/acpi/acconfig.h4
-rw-r--r--include/acpi/acdebug.h2
-rw-r--r--include/acpi/acdisasm.h2
-rw-r--r--include/acpi/acdispat.h2
-rw-r--r--include/acpi/acevents.h2
-rw-r--r--include/acpi/acexcep.h2
-rw-r--r--include/acpi/acglobal.h2
-rw-r--r--include/acpi/achware.h2
-rw-r--r--include/acpi/acinterp.h2
-rw-r--r--include/acpi/aclocal.h2
-rw-r--r--include/acpi/acmacros.h83
-rw-r--r--include/acpi/acnames.h2
-rw-r--r--include/acpi/acnamesp.h4
-rw-r--r--include/acpi/acobject.h2
-rw-r--r--include/acpi/acopcode.h2
-rw-r--r--include/acpi/acoutput.h12
-rw-r--r--include/acpi/acparser.h2
-rw-r--r--include/acpi/acpi.h2
-rw-r--r--include/acpi/acpiosxf.h2
-rw-r--r--include/acpi/acpixf.h2
-rw-r--r--include/acpi/acresrc.h2
-rw-r--r--include/acpi/acstruct.h2
-rw-r--r--include/acpi/actables.h2
-rw-r--r--include/acpi/actbl.h2
-rw-r--r--include/acpi/actbl1.h2
-rw-r--r--include/acpi/actbl2.h2
-rw-r--r--include/acpi/actypes.h2
-rw-r--r--include/acpi/acutils.h9
-rw-r--r--include/acpi/amlcode.h2
-rw-r--r--include/acpi/amlresrc.h2
-rw-r--r--include/acpi/platform/acenv.h2
-rw-r--r--include/acpi/platform/acgcc.h2
-rw-r--r--include/acpi/platform/aclinux.h2
142 files changed, 658 insertions, 1023 deletions
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c
index 2022aeaecfbb..f3a008ff1eae 100644
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/dispatcher/dsfield.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
@@ -293,7 +293,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
293 + (acpi_integer) arg->common.value.size; 293 + (acpi_integer) arg->common.value.size;
294 294
295 if (position > ACPI_UINT32_MAX) { 295 if (position > ACPI_UINT32_MAX) {
296 ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", (char *)&info->field_node->name)); 296 ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", ACPI_CAST_PTR(char, &info->field_node->name)));
297 return_ACPI_STATUS(AE_SUPPORT); 297 return_ACPI_STATUS(AE_SUPPORT);
298 } 298 }
299 299
@@ -302,9 +302,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
302 302
303 default: 303 default:
304 304
305 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 305 ACPI_REPORT_ERROR(("Invalid opcode in field list: %X\n",
306 "Invalid opcode in field list: %X\n", 306 arg->common.aml_opcode));
307 arg->common.aml_opcode));
308 return_ACPI_STATUS(AE_AML_BAD_OPCODE); 307 return_ACPI_STATUS(AE_AML_BAD_OPCODE);
309 } 308 }
310 309
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index 4fa80abfe6c0..258fbdfaa69c 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.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
@@ -84,7 +84,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
84 acpi_object_type type; 84 acpi_object_type type;
85 acpi_status status; 85 acpi_status status;
86 86
87 ACPI_FUNCTION_NAME("ds_init_one_object"); 87 ACPI_FUNCTION_ENTRY();
88 88
89 /* 89 /*
90 * We are only interested in NS nodes owned by the table that 90 * We are only interested in NS nodes owned by the table that
@@ -105,11 +105,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
105 105
106 status = acpi_ds_initialize_region(obj_handle); 106 status = acpi_ds_initialize_region(obj_handle);
107 if (ACPI_FAILURE(status)) { 107 if (ACPI_FAILURE(status)) {
108 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 108 ACPI_REPORT_ERROR(("Region %p [%4.4s] - Init failure, %s\n", obj_handle, acpi_ut_get_node_name(obj_handle), acpi_format_exception(status)));
109 "Region %p [%4.4s] - Init failure, %s\n",
110 obj_handle,
111 acpi_ut_get_node_name(obj_handle),
112 acpi_format_exception(status)));
113 } 109 }
114 110
115 info->op_region_count++; 111 info->op_region_count++;
@@ -148,11 +144,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
148 */ 144 */
149 status = acpi_ds_parse_method(obj_handle); 145 status = acpi_ds_parse_method(obj_handle);
150 if (ACPI_FAILURE(status)) { 146 if (ACPI_FAILURE(status)) {
151 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 147 ACPI_REPORT_ERROR(("\n+Method %p [%4.4s] - parse failure, %s\n", obj_handle, acpi_ut_get_node_name(obj_handle), acpi_format_exception(status)));
152 "\n+Method %p [%4.4s] - parse failure, %s\n",
153 obj_handle,
154 acpi_ut_get_node_name(obj_handle),
155 acpi_format_exception(status)));
156 148
157 /* This parse failed, but we will continue parsing more methods */ 149 /* This parse failed, but we will continue parsing more methods */
158 } 150 }
@@ -214,8 +206,8 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
214 status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX, 206 status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,
215 acpi_ds_init_one_object, &info, NULL); 207 acpi_ds_init_one_object, &info, NULL);
216 if (ACPI_FAILURE(status)) { 208 if (ACPI_FAILURE(status)) {
217 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed, %s\n", 209 ACPI_REPORT_ERROR(("walk_namespace failed, %s\n",
218 acpi_format_exception(status))); 210 acpi_format_exception(status)));
219 } 211 }
220 212
221 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 213 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index e7ce86b8d954..d861add3fc1f 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.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
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 }
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 905a84e4b145..dc116d679a58 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.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
@@ -214,10 +214,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
214 byte_list = arg->named.next; 214 byte_list = arg->named.next;
215 if (byte_list) { 215 if (byte_list) {
216 if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) { 216 if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) {
217 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 217 ACPI_REPORT_ERROR(("Expecting bytelist, got AML opcode %X in op %p\n", byte_list->common.aml_opcode, byte_list));
218 "Expecting bytelist, got AML opcode %X in op %p\n",
219 byte_list->common.aml_opcode,
220 byte_list));
221 218
222 acpi_ut_remove_reference(obj_desc); 219 acpi_ut_remove_reference(obj_desc);
223 return (AE_TYPE); 220 return (AE_TYPE);
@@ -543,9 +540,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
543 540
544 default: 541 default:
545 542
546 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 543 ACPI_REPORT_ERROR(("Unknown constant opcode %X\n", opcode));
547 "Unknown constant opcode %X\n",
548 opcode));
549 status = AE_AML_OPERAND_TYPE; 544 status = AE_AML_OPERAND_TYPE;
550 break; 545 break;
551 } 546 }
@@ -560,9 +555,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
560 break; 555 break;
561 556
562 default: 557 default:
563 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 558 ACPI_REPORT_ERROR(("Unknown Integer type %X\n",
564 "Unknown Integer type %X\n", 559 op_info->type));
565 op_info->type));
566 status = AE_AML_OPERAND_TYPE; 560 status = AE_AML_OPERAND_TYPE;
567 break; 561 break;
568 } 562 }
@@ -640,9 +634,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
640 634
641 default: 635 default:
642 636
643 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 637 ACPI_REPORT_ERROR(("Unimplemented data type: %X\n",
644 "Unimplemented data type: %X\n", 638 ACPI_GET_OBJECT_TYPE(obj_desc)));
645 ACPI_GET_OBJECT_TYPE(obj_desc)));
646 639
647 status = AE_AML_OPERAND_TYPE; 640 status = AE_AML_OPERAND_TYPE;
648 break; 641 break;
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 939d167bf87b..60414ee84b0a 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -413,9 +413,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
413 /* Host object must be a Buffer */ 413 /* Host object must be a Buffer */
414 414
415 if (ACPI_GET_OBJECT_TYPE(buffer_desc) != ACPI_TYPE_BUFFER) { 415 if (ACPI_GET_OBJECT_TYPE(buffer_desc) != ACPI_TYPE_BUFFER) {
416 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 416 ACPI_REPORT_ERROR(("Target of Create Field is not a Buffer object - %s\n", acpi_ut_get_object_type_name(buffer_desc)));
417 "Target of Create Field is not a Buffer object - %s\n",
418 acpi_ut_get_object_type_name(buffer_desc)));
419 417
420 status = AE_AML_OPERAND_TYPE; 418 status = AE_AML_OPERAND_TYPE;
421 goto cleanup; 419 goto cleanup;
@@ -427,10 +425,9 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
427 * after resolution in acpi_ex_resolve_operands(). 425 * after resolution in acpi_ex_resolve_operands().
428 */ 426 */
429 if (ACPI_GET_DESCRIPTOR_TYPE(result_desc) != ACPI_DESC_TYPE_NAMED) { 427 if (ACPI_GET_DESCRIPTOR_TYPE(result_desc) != ACPI_DESC_TYPE_NAMED) {
430 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 428 ACPI_REPORT_ERROR(("(%s) destination not a NS Node [%s]\n",
431 "(%s) destination not a NS Node [%s]\n", 429 acpi_ps_get_opcode_name(aml_opcode),
432 acpi_ps_get_opcode_name(aml_opcode), 430 acpi_ut_get_descriptor_name(result_desc)));
433 acpi_ut_get_descriptor_name(result_desc)));
434 431
435 status = AE_AML_OPERAND_TYPE; 432 status = AE_AML_OPERAND_TYPE;
436 goto cleanup; 433 goto cleanup;
@@ -453,8 +450,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
453 /* Must have a valid (>0) bit count */ 450 /* Must have a valid (>0) bit count */
454 451
455 if (bit_count == 0) { 452 if (bit_count == 0) {
456 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 453 ACPI_REPORT_ERROR(("Attempt to create_field of length 0\n"));
457 "Attempt to create_field of length 0\n"));
458 status = AE_AML_OPERAND_VALUE; 454 status = AE_AML_OPERAND_VALUE;
459 goto cleanup; 455 goto cleanup;
460 } 456 }
@@ -507,9 +503,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
507 503
508 default: 504 default:
509 505
510 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 506 ACPI_REPORT_ERROR(("Unknown field creation opcode %02x\n",
511 "Unknown field creation opcode %02x\n", 507 aml_opcode));
512 aml_opcode));
513 status = AE_AML_BAD_OPCODE; 508 status = AE_AML_BAD_OPCODE;
514 goto cleanup; 509 goto cleanup;
515 } 510 }
@@ -517,13 +512,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
517 /* Entire field must fit within the current length of the buffer */ 512 /* Entire field must fit within the current length of the buffer */
518 513
519 if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) { 514 if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) {
520 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 515 ACPI_REPORT_ERROR(("Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n", acpi_ut_get_node_name(result_desc), bit_offset + bit_count, acpi_ut_get_node_name(buffer_desc->buffer.node), 8 * (u32) buffer_desc->buffer.length));
521 "Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n",
522 acpi_ut_get_node_name(result_desc),
523 bit_offset + bit_count,
524 acpi_ut_get_node_name(buffer_desc->buffer.
525 node),
526 8 * (u32) buffer_desc->buffer.length));
527 status = AE_AML_BUFFER_LIMIT; 516 status = AE_AML_BUFFER_LIMIT;
528 goto cleanup; 517 goto cleanup;
529 } 518 }
@@ -629,9 +618,10 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
629 "after acpi_ex_resolve_operands"); 618 "after acpi_ex_resolve_operands");
630 619
631 if (ACPI_FAILURE(status)) { 620 if (ACPI_FAILURE(status)) {
632 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "(%s) bad operand(s) (%X)\n", 621 ACPI_REPORT_ERROR(("(%s) bad operand(s) (%X)\n",
633 acpi_ps_get_opcode_name(op->common. 622 acpi_ps_get_opcode_name(op->common.
634 aml_opcode), status)); 623 aml_opcode),
624 status));
635 625
636 return_ACPI_STATUS(status); 626 return_ACPI_STATUS(status);
637 } 627 }
@@ -1155,9 +1145,8 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
1155 1145
1156 default: 1146 default:
1157 1147
1158 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 1148 ACPI_REPORT_ERROR(("Unknown control opcode=%X Op=%p\n",
1159 "Unknown control opcode=%X Op=%p\n", 1149 op->common.aml_opcode, op));
1160 op->common.aml_opcode, op));
1161 1150
1162 status = AE_AML_BAD_OPCODE; 1151 status = AE_AML_BAD_OPCODE;
1163 break; 1152 break;
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}
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index 74f6996db2d7..5a9b91fe93d2 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -100,9 +100,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
100 if (result_obj) { 100 if (result_obj) {
101 status = acpi_ds_result_pop(&obj_desc, walk_state); 101 status = acpi_ds_result_pop(&obj_desc, walk_state);
102 if (ACPI_FAILURE(status)) { 102 if (ACPI_FAILURE(status)) {
103 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 103 ACPI_REPORT_ERROR(("Could not get result from predicate evaluation, %s\n", acpi_format_exception(status)));
104 "Could not get result from predicate evaluation, %s\n",
105 acpi_format_exception(status)));
106 104
107 return_ACPI_STATUS(status); 105 return_ACPI_STATUS(status);
108 } 106 }
@@ -123,9 +121,8 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
123 } 121 }
124 122
125 if (!obj_desc) { 123 if (!obj_desc) {
126 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 124 ACPI_REPORT_ERROR(("No predicate obj_desc=%p State=%p\n",
127 "No predicate obj_desc=%p State=%p\n", 125 obj_desc, walk_state));
128 obj_desc, walk_state));
129 126
130 return_ACPI_STATUS(AE_AML_NO_OPERAND); 127 return_ACPI_STATUS(AE_AML_NO_OPERAND);
131 } 128 }
@@ -140,10 +137,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
140 } 137 }
141 138
142 if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) { 139 if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
143 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 140 ACPI_REPORT_ERROR(("Bad predicate (not an integer) obj_desc=%p State=%p Type=%X\n", obj_desc, walk_state, ACPI_GET_OBJECT_TYPE(obj_desc)));
144 "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X\n",
145 obj_desc, walk_state,
146 ACPI_GET_OBJECT_TYPE(obj_desc)));
147 141
148 status = AE_AML_OPERAND_TYPE; 142 status = AE_AML_OPERAND_TYPE;
149 goto cleanup; 143 goto cleanup;
@@ -362,8 +356,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
362 op_class = walk_state->op_info->class; 356 op_class = walk_state->op_info->class;
363 357
364 if (op_class == AML_CLASS_UNKNOWN) { 358 if (op_class == AML_CLASS_UNKNOWN) {
365 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown opcode %X\n", 359 ACPI_REPORT_ERROR(("Unknown opcode %X\n",
366 op->common.aml_opcode)); 360 op->common.aml_opcode));
367 return_ACPI_STATUS(AE_NOT_IMPLEMENTED); 361 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
368 } 362 }
369 363
@@ -453,12 +447,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
453 walk_state->operands[1]->reference.offset)) { 447 walk_state->operands[1]->reference.offset)) {
454 status = AE_OK; 448 status = AE_OK;
455 } else { 449 } else {
456 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 450 ACPI_REPORT_ERROR(("[%s]: Could not resolve operands, %s\n", acpi_ps_get_opcode_name(walk_state->opcode), acpi_format_exception(status)));
457 "[%s]: Could not resolve operands, %s\n",
458 acpi_ps_get_opcode_name
459 (walk_state->opcode),
460 acpi_format_exception
461 (status)));
462 } 451 }
463 } 452 }
464 453
@@ -677,8 +666,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
677 666
678 case AML_TYPE_UNDEFINED: 667 case AML_TYPE_UNDEFINED:
679 668
680 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 669 ACPI_REPORT_ERROR(("Undefined opcode type Op=%p\n",
681 "Undefined opcode type Op=%p\n", op)); 670 op));
682 return_ACPI_STATUS(AE_NOT_IMPLEMENTED); 671 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
683 672
684 case AML_TYPE_BOGUS: 673 case AML_TYPE_BOGUS:
@@ -690,10 +679,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
690 679
691 default: 680 default:
692 681
693 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 682 ACPI_REPORT_ERROR(("Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n", op_class, op_type, op->common.aml_opcode, op));
694 "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n",
695 op_class, op_type,
696 op->common.aml_opcode, op));
697 683
698 status = AE_NOT_IMPLEMENTED; 684 status = AE_NOT_IMPLEMENTED;
699 break; 685 break;
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 441931cab08a..4cad6afa82f7 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.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
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index defe956ef751..e7fc88ca47ba 100644
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.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
@@ -107,14 +107,14 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
107 if (!node) { 107 if (!node) {
108 /* Invalid scope */ 108 /* Invalid scope */
109 109
110 ACPI_REPORT_ERROR(("ds_scope_stack_push: null scope passed\n")); 110 ACPI_REPORT_ERROR(("Null scope parameter\n"));
111 return_ACPI_STATUS(AE_BAD_PARAMETER); 111 return_ACPI_STATUS(AE_BAD_PARAMETER);
112 } 112 }
113 113
114 /* Make sure object type is valid */ 114 /* Make sure object type is valid */
115 115
116 if (!acpi_ut_valid_object_type(type)) { 116 if (!acpi_ut_valid_object_type(type)) {
117 ACPI_REPORT_WARNING(("ds_scope_stack_push: Invalid object type: 0x%X\n", type)); 117 ACPI_REPORT_WARNING(("Invalid object type: 0x%X\n", type));
118 } 118 }
119 119
120 /* Allocate a new scope object */ 120 /* Allocate a new scope object */
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 7d68a5aaf3c4..61aae2dcc5e2 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.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
@@ -92,26 +92,23 @@ acpi_ds_result_remove(union acpi_operand_object **object,
92 92
93 state = walk_state->results; 93 state = walk_state->results;
94 if (!state) { 94 if (!state) {
95 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 95 ACPI_REPORT_ERROR(("No result object pushed! State=%p\n",
96 "No result object pushed! State=%p\n", 96 walk_state));
97 walk_state));
98 return (AE_NOT_EXIST); 97 return (AE_NOT_EXIST);
99 } 98 }
100 99
101 if (index >= ACPI_OBJ_MAX_OPERAND) { 100 if (index >= ACPI_OBJ_MAX_OPERAND) {
102 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 101 ACPI_REPORT_ERROR(("Index out of range: %X State=%p Num=%X\n",
103 "Index out of range: %X State=%p Num=%X\n", 102 index, walk_state,
104 index, walk_state, 103 state->results.num_results));
105 state->results.num_results));
106 } 104 }
107 105
108 /* Check for a valid result object */ 106 /* Check for a valid result object */
109 107
110 if (!state->results.obj_desc[index]) { 108 if (!state->results.obj_desc[index]) {
111 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 109 ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X, Index=%X\n",
112 "Null operand! State=%p #Ops=%X, Index=%X\n", 110 walk_state, state->results.num_results,
113 walk_state, state->results.num_results, 111 index));
114 index));
115 return (AE_AML_NO_RETURN_VALUE); 112 return (AE_AML_NO_RETURN_VALUE);
116 } 113 }
117 114
@@ -163,9 +160,8 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
163 } 160 }
164 161
165 if (!state->results.num_results) { 162 if (!state->results.num_results) {
166 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 163 ACPI_REPORT_ERROR(("Result stack is empty! State=%p\n",
167 "Result stack is empty! State=%p\n", 164 walk_state));
168 walk_state));
169 return (AE_AML_NO_RETURN_VALUE); 165 return (AE_AML_NO_RETURN_VALUE);
170 } 166 }
171 167
@@ -192,8 +188,7 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
192 } 188 }
193 } 189 }
194 190
195 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 191 ACPI_REPORT_ERROR(("No result objects! State=%p\n", walk_state));
196 "No result objects! State=%p\n", walk_state));
197 return (AE_AML_NO_RETURN_VALUE); 192 return (AE_AML_NO_RETURN_VALUE);
198} 193}
199 194
@@ -222,15 +217,14 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
222 217
223 state = walk_state->results; 218 state = walk_state->results;
224 if (!state) { 219 if (!state) {
225 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 220 ACPI_REPORT_ERROR(("No result object pushed! State=%p\n",
226 "Warning: No result object pushed! State=%p\n", 221 walk_state));
227 walk_state));
228 return (AE_NOT_EXIST); 222 return (AE_NOT_EXIST);
229 } 223 }
230 224
231 if (!state->results.num_results) { 225 if (!state->results.num_results) {
232 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 226 ACPI_REPORT_ERROR(("No result objects! State=%p\n",
233 "No result objects! State=%p\n", walk_state)); 227 walk_state));
234 return (AE_AML_NO_RETURN_VALUE); 228 return (AE_AML_NO_RETURN_VALUE);
235 } 229 }
236 230
@@ -250,10 +244,9 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
250 /* Check for a valid result object */ 244 /* Check for a valid result object */
251 245
252 if (!*object) { 246 if (!*object) {
253 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 247 ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X Index=%X\n",
254 "Null operand! State=%p #Ops=%X Index=%X\n", 248 walk_state, state->results.num_results,
255 walk_state, state->results.num_results, 249 (u32) index));
256 (u32) index));
257 return (AE_AML_NO_RETURN_VALUE); 250 return (AE_AML_NO_RETURN_VALUE);
258 } 251 }
259 252
@@ -293,18 +286,14 @@ acpi_ds_result_push(union acpi_operand_object * object,
293 } 286 }
294 287
295 if (state->results.num_results == ACPI_OBJ_NUM_OPERANDS) { 288 if (state->results.num_results == ACPI_OBJ_NUM_OPERANDS) {
296 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 289 ACPI_REPORT_ERROR(("Result stack overflow: Obj=%p State=%p Num=%X\n", object, walk_state, state->results.num_results));
297 "Result stack overflow: Obj=%p State=%p Num=%X\n",
298 object, walk_state,
299 state->results.num_results));
300 return (AE_STACK_OVERFLOW); 290 return (AE_STACK_OVERFLOW);
301 } 291 }
302 292
303 if (!object) { 293 if (!object) {
304 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 294 ACPI_REPORT_ERROR(("Null Object! Obj=%p State=%p Num=%X\n",
305 "Null Object! Obj=%p State=%p Num=%X\n", 295 object, walk_state,
306 object, walk_state, 296 state->results.num_results));
307 state->results.num_results));
308 return (AE_BAD_PARAMETER); 297 return (AE_BAD_PARAMETER);
309 } 298 }
310 299
@@ -413,10 +402,7 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
413 /* Check for stack overflow */ 402 /* Check for stack overflow */
414 403
415 if (walk_state->num_operands >= ACPI_OBJ_NUM_OPERANDS) { 404 if (walk_state->num_operands >= ACPI_OBJ_NUM_OPERANDS) {
416 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 405 ACPI_REPORT_ERROR(("Object stack overflow! Obj=%p State=%p #Ops=%X\n", object, walk_state, walk_state->num_operands));
417 "overflow! Obj=%p State=%p #Ops=%X\n",
418 object, walk_state,
419 walk_state->num_operands));
420 return (AE_STACK_OVERFLOW); 406 return (AE_STACK_OVERFLOW);
421 } 407 }
422 408
@@ -460,10 +446,7 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
460 /* Check for stack underflow */ 446 /* Check for stack underflow */
461 447
462 if (walk_state->num_operands == 0) { 448 if (walk_state->num_operands == 0) {
463 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 449 ACPI_REPORT_ERROR(("Object stack underflow! Count=%X State=%p #Ops=%X\n", pop_count, walk_state, walk_state->num_operands));
464 "Underflow! Count=%X State=%p #Ops=%X\n",
465 pop_count, walk_state,
466 walk_state->num_operands));
467 return (AE_STACK_UNDERFLOW); 450 return (AE_STACK_UNDERFLOW);
468 } 451 }
469 452
@@ -506,10 +489,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
506 /* Check for stack underflow */ 489 /* Check for stack underflow */
507 490
508 if (walk_state->num_operands == 0) { 491 if (walk_state->num_operands == 0) {
509 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 492 ACPI_REPORT_ERROR(("Object stack underflow! Count=%X State=%p #Ops=%X\n", pop_count, walk_state, walk_state->num_operands));
510 "Underflow! Count=%X State=%p #Ops=%X\n",
511 pop_count, walk_state,
512 walk_state->num_operands));
513 return (AE_STACK_UNDERFLOW); 493 return (AE_STACK_UNDERFLOW);
514 } 494 }
515 495
@@ -826,16 +806,14 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
826 } 806 }
827 807
828 if (walk_state->data_type != ACPI_DESC_TYPE_WALK) { 808 if (walk_state->data_type != ACPI_DESC_TYPE_WALK) {
829 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 809 ACPI_REPORT_ERROR(("%p is not a valid walk state\n",
830 "%p is not a valid walk state\n", 810 walk_state));
831 walk_state));
832 return; 811 return;
833 } 812 }
834 813
835 if (walk_state->parser_state.scope) { 814 if (walk_state->parser_state.scope) {
836 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 815 ACPI_REPORT_ERROR(("%p walk still has a scope list\n",
837 "%p walk still has a scope list\n", 816 walk_state));
838 walk_state));
839 } 817 }
840 818
841 /* Always must free any linked control states */ 819 /* Always must free any linked control states */
@@ -894,25 +872,18 @@ acpi_ds_result_insert(void *object,
894 872
895 state = walk_state->results; 873 state = walk_state->results;
896 if (!state) { 874 if (!state) {
897 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 875 ACPI_REPORT_ERROR(("No result object pushed! State=%p\n",
898 "No result object pushed! State=%p\n", 876 walk_state));
899 walk_state));
900 return (AE_NOT_EXIST); 877 return (AE_NOT_EXIST);
901 } 878 }
902 879
903 if (index >= ACPI_OBJ_NUM_OPERANDS) { 880 if (index >= ACPI_OBJ_NUM_OPERANDS) {
904 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 881 ACPI_REPORT_ERROR(("Index out of range: %X Obj=%p State=%p Num=%X\n", index, object, walk_state, state->results.num_results));
905 "Index out of range: %X Obj=%p State=%p Num=%X\n",
906 index, object, walk_state,
907 state->results.num_results));
908 return (AE_BAD_PARAMETER); 882 return (AE_BAD_PARAMETER);
909 } 883 }
910 884
911 if (!object) { 885 if (!object) {
912 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 886 ACPI_REPORT_ERROR(("Null Object! Index=%X Obj=%p State=%p Num=%X\n", index, object, walk_state, state->results.num_results));
913 "Null Object! Index=%X Obj=%p State=%p Num=%X\n",
914 index, object, walk_state,
915 state->results.num_results));
916 return (AE_BAD_PARAMETER); 887 return (AE_BAD_PARAMETER);
917 } 888 }
918 889
@@ -986,9 +957,7 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
986 /* Check for stack underflow */ 957 /* Check for stack underflow */
987 958
988 if (walk_state->num_operands == 0) { 959 if (walk_state->num_operands == 0) {
989 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 960 ACPI_REPORT_ERROR(("Missing operand/stack empty! State=%p #Ops=%X\n", walk_state, walk_state->num_operands));
990 "Missing operand/stack empty! State=%p #Ops=%X\n",
991 walk_state, walk_state->num_operands));
992 *object = NULL; 961 *object = NULL;
993 return (AE_AML_NO_OPERAND); 962 return (AE_AML_NO_OPERAND);
994 } 963 }
@@ -1000,9 +969,8 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
1000 /* Check for a valid operand */ 969 /* Check for a valid operand */
1001 970
1002 if (!walk_state->operands[walk_state->num_operands]) { 971 if (!walk_state->operands[walk_state->num_operands]) {
1003 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 972 ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X\n",
1004 "Null operand! State=%p #Ops=%X\n", 973 walk_state, walk_state->num_operands));
1005 walk_state, walk_state->num_operands));
1006 *object = NULL; 974 *object = NULL;
1007 return (AE_AML_NO_OPERAND); 975 return (AE_AML_NO_OPERAND);
1008 } 976 }
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index 9522c643b88b..b380ae1044b7 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.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
@@ -73,7 +73,7 @@ acpi_status acpi_ev_initialize_events(void)
73 /* Make sure we have ACPI tables */ 73 /* Make sure we have ACPI tables */
74 74
75 if (!acpi_gbl_DSDT) { 75 if (!acpi_gbl_DSDT) {
76 ACPI_DEBUG_PRINT((ACPI_DB_WARN, "No ACPI tables present!\n")); 76 ACPI_REPORT_WARNING(("No ACPI tables present!\n"));
77 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 77 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
78 } 78 }
79 79
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index bdd86537738e..353b907edbfa 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.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
@@ -599,7 +599,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
599 ACPI_GPE_EDGE_TRIGGERED) { 599 ACPI_GPE_EDGE_TRIGGERED) {
600 status = acpi_hw_clear_gpe(gpe_event_info); 600 status = acpi_hw_clear_gpe(gpe_event_info);
601 if (ACPI_FAILURE(status)) { 601 if (ACPI_FAILURE(status)) {
602 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 602 ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n",
603 acpi_format_exception(status),
604 gpe_number));
603 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 605 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
604 } 606 }
605 } 607 }
@@ -637,7 +639,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
637 ACPI_GPE_LEVEL_TRIGGERED) { 639 ACPI_GPE_LEVEL_TRIGGERED) {
638 status = acpi_hw_clear_gpe(gpe_event_info); 640 status = acpi_hw_clear_gpe(gpe_event_info);
639 if (ACPI_FAILURE(status)) { 641 if (ACPI_FAILURE(status)) {
640 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 642 ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
641 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 643 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
642 } 644 }
643 } 645 }
@@ -651,7 +653,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
651 */ 653 */
652 status = acpi_ev_disable_gpe(gpe_event_info); 654 status = acpi_ev_disable_gpe(gpe_event_info);
653 if (ACPI_FAILURE(status)) { 655 if (ACPI_FAILURE(status)) {
654 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 656 ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n",
657 acpi_format_exception(status),
658 gpe_number));
655 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 659 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
656 } 660 }
657 661
@@ -663,7 +667,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
663 acpi_ev_asynch_execute_gpe_method, 667 acpi_ev_asynch_execute_gpe_method,
664 gpe_event_info); 668 gpe_event_info);
665 if (ACPI_FAILURE(status)) { 669 if (ACPI_FAILURE(status)) {
666 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number)); 670 ACPI_REPORT_ERROR(("%s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number));
667 } 671 }
668 break; 672 break;
669 673
@@ -671,7 +675,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
671 675
672 /* No handler or method to run! */ 676 /* No handler or method to run! */
673 677
674 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: No handler or method for GPE[%2X], disabling event\n", gpe_number)); 678 ACPI_REPORT_ERROR(("No handler or method for GPE[%2X], disabling event\n", gpe_number));
675 679
676 /* 680 /*
677 * Disable the GPE. The GPE will remain disabled until the ACPI 681 * Disable the GPE. The GPE will remain disabled until the ACPI
@@ -679,7 +683,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
679 */ 683 */
680 status = acpi_ev_disable_gpe(gpe_event_info); 684 status = acpi_ev_disable_gpe(gpe_event_info);
681 if (ACPI_FAILURE(status)) { 685 if (ACPI_FAILURE(status)) {
682 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 686 ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n",
687 acpi_format_exception(status),
688 gpe_number));
683 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 689 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
684 } 690 }
685 break; 691 break;
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 8efca2eac27e..3b9bbdda551d 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.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
@@ -279,9 +279,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
279 default: 279 default:
280 /* Unknown method type, just ignore it! */ 280 /* Unknown method type, just ignore it! */
281 281
282 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 282 ACPI_REPORT_ERROR(("Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n", name));
283 "Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n",
284 name));
285 return_ACPI_STATUS(AE_OK); 283 return_ACPI_STATUS(AE_OK);
286 } 284 }
287 285
@@ -291,9 +289,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
291 if (gpe_number == ACPI_UINT32_MAX) { 289 if (gpe_number == ACPI_UINT32_MAX) {
292 /* Conversion failed; invalid method, just ignore it */ 290 /* Conversion failed; invalid method, just ignore it */
293 291
294 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 292 ACPI_REPORT_ERROR(("Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n", name));
295 "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n",
296 name));
297 return_ACPI_STATUS(AE_OK); 293 return_ACPI_STATUS(AE_OK);
298 } 294 }
299 295
@@ -527,9 +523,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
527 acpi_ev_gpe_xrupt_handler, 523 acpi_ev_gpe_xrupt_handler,
528 gpe_xrupt); 524 gpe_xrupt);
529 if (ACPI_FAILURE(status)) { 525 if (ACPI_FAILURE(status)) {
530 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 526 ACPI_REPORT_ERROR(("Could not install GPE interrupt handler at level 0x%X\n", interrupt_number));
531 "Could not install GPE interrupt handler at level 0x%X\n",
532 interrupt_number));
533 return_PTR(NULL); 527 return_PTR(NULL);
534 } 528 }
535 } 529 }
@@ -745,8 +739,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
745 sizeof(struct 739 sizeof(struct
746 acpi_gpe_register_info)); 740 acpi_gpe_register_info));
747 if (!gpe_register_info) { 741 if (!gpe_register_info) {
748 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 742 ACPI_REPORT_ERROR(("Could not allocate the gpe_register_info table\n"));
749 "Could not allocate the gpe_register_info table\n"));
750 return_ACPI_STATUS(AE_NO_MEMORY); 743 return_ACPI_STATUS(AE_NO_MEMORY);
751 } 744 }
752 745
@@ -759,8 +752,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
759 ACPI_GPE_REGISTER_WIDTH) * 752 ACPI_GPE_REGISTER_WIDTH) *
760 sizeof(struct acpi_gpe_event_info)); 753 sizeof(struct acpi_gpe_event_info));
761 if (!gpe_event_info) { 754 if (!gpe_event_info) {
762 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 755 ACPI_REPORT_ERROR(("Could not allocate the gpe_event_info table\n"));
763 "Could not allocate the gpe_event_info table\n"));
764 status = AE_NO_MEMORY; 756 status = AE_NO_MEMORY;
765 goto error_exit; 757 goto error_exit;
766 } 758 }
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 7e57b8470f55..78883239784a 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.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
@@ -542,9 +542,7 @@ void acpi_ev_terminate(void)
542 for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) { 542 for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
543 status = acpi_disable_event((u32) i, 0); 543 status = acpi_disable_event((u32) i, 0);
544 if (ACPI_FAILURE(status)) { 544 if (ACPI_FAILURE(status)) {
545 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 545 ACPI_REPORT_ERROR(("Could not disable fixed event %d\n", (u32) i));
546 "Could not disable fixed event %d\n",
547 (u32) i));
548 } 546 }
549 } 547 }
550 548
@@ -556,8 +554,7 @@ void acpi_ev_terminate(void)
556 554
557 status = acpi_ev_remove_sci_handler(); 555 status = acpi_ev_remove_sci_handler();
558 if (ACPI_FAILURE(status)) { 556 if (ACPI_FAILURE(status)) {
559 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 557 ACPI_REPORT_ERROR(("Could not remove SCI handler\n"));
560 "Could not remove SCI handler\n"));
561 } 558 }
562 } 559 }
563 560
@@ -570,8 +567,7 @@ void acpi_ev_terminate(void)
570 if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) { 567 if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {
571 status = acpi_disable(); 568 status = acpi_disable();
572 if (ACPI_FAILURE(status)) { 569 if (ACPI_FAILURE(status)) {
573 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 570 ACPI_REPORT_WARNING(("acpi_disable failed\n"));
574 "acpi_disable failed\n"));
575 } 571 }
576 } 572 }
577 return_VOID; 573 return_VOID;
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 84fad082d80d..900e5b32e595 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.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
@@ -295,12 +295,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
295 295
296 handler_desc = region_obj->region.handler; 296 handler_desc = region_obj->region.handler;
297 if (!handler_desc) { 297 if (!handler_desc) {
298 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 298 ACPI_REPORT_ERROR(("No handler for Region [%4.4s] (%p) [%s]\n",
299 "No handler for Region [%4.4s] (%p) [%s]\n", 299 acpi_ut_get_node_name(region_obj->region.
300 acpi_ut_get_node_name(region_obj->region. 300 node), region_obj,
301 node), region_obj, 301 acpi_ut_get_region_name(region_obj->region.
302 acpi_ut_get_region_name(region_obj->region. 302 space_id)));
303 space_id)));
304 303
305 return_ACPI_STATUS(AE_NOT_EXIST); 304 return_ACPI_STATUS(AE_NOT_EXIST);
306 } 305 }
@@ -317,12 +316,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
317 if (!region_setup) { 316 if (!region_setup) {
318 /* No initialization routine, exit with error */ 317 /* No initialization routine, exit with error */
319 318
320 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 319 ACPI_REPORT_ERROR(("No init routine for region(%p) [%s]\n", region_obj, acpi_ut_get_region_name(region_obj->region.space_id)));
321 "No init routine for region(%p) [%s]\n",
322 region_obj,
323 acpi_ut_get_region_name(region_obj->
324 region.
325 space_id)));
326 return_ACPI_STATUS(AE_NOT_EXIST); 320 return_ACPI_STATUS(AE_NOT_EXIST);
327 } 321 }
328 322
@@ -347,12 +341,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
347 /* Check for failure of the Region Setup */ 341 /* Check for failure of the Region Setup */
348 342
349 if (ACPI_FAILURE(status)) { 343 if (ACPI_FAILURE(status)) {
350 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 344 ACPI_REPORT_ERROR(("Region Initialization: %s [%s]\n",
351 "Region Init: %s [%s]\n", 345 acpi_format_exception(status),
352 acpi_format_exception(status), 346 acpi_ut_get_region_name(region_obj->
353 acpi_ut_get_region_name(region_obj-> 347 region.
354 region. 348 space_id)));
355 space_id)));
356 return_ACPI_STATUS(status); 349 return_ACPI_STATUS(status);
357 } 350 }
358 351
@@ -501,12 +494,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
501 494
502 status = acpi_ev_execute_reg_method(region_obj, 0); 495 status = acpi_ev_execute_reg_method(region_obj, 0);
503 if (ACPI_FAILURE(status)) { 496 if (ACPI_FAILURE(status)) {
504 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 497 ACPI_REPORT_ERROR(("%s from region _REG, [%s]\n", acpi_format_exception(status), acpi_ut_get_region_name(region_obj->region.space_id)));
505 "%s from region _REG, [%s]\n",
506 acpi_format_exception(status),
507 acpi_ut_get_region_name
508 (region_obj->region.
509 space_id)));
510 } 498 }
511 499
512 if (acpi_ns_is_locked) { 500 if (acpi_ns_is_locked) {
@@ -528,12 +516,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
528 /* Init routine may fail, Just ignore errors */ 516 /* Init routine may fail, Just ignore errors */
529 517
530 if (ACPI_FAILURE(status)) { 518 if (ACPI_FAILURE(status)) {
531 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 519 ACPI_REPORT_ERROR(("%s from region init, [%s]\n", acpi_format_exception(status), acpi_ut_get_region_name(region_obj->region.space_id)));
532 "%s from region init, [%s]\n",
533 acpi_format_exception(status),
534 acpi_ut_get_region_name
535 (region_obj->region.
536 space_id)));
537 } 520 }
538 521
539 region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE); 522 region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index a1bd2da27c45..de1a38e9ce22 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.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
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index e2c0b48a7e9f..9a622169008a 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -6,7 +6,7 @@
6 ******************************************************************************/ 6 ******************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index 57d73299298e..b2f69b1ac4b5 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.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
@@ -143,8 +143,8 @@ acpi_install_fixed_event_handler(u32 event,
143 if (ACPI_SUCCESS(status)) 143 if (ACPI_SUCCESS(status))
144 status = acpi_enable_event(event, 0); 144 status = acpi_enable_event(event, 0);
145 if (ACPI_FAILURE(status)) { 145 if (ACPI_FAILURE(status)) {
146 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 146 ACPI_REPORT_WARNING(("Could not enable fixed event %X\n",
147 "Could not enable fixed event.\n")); 147 event));
148 148
149 /* Remove the handler */ 149 /* Remove the handler */
150 150
@@ -204,10 +204,9 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
204 acpi_gbl_fixed_event_handlers[event].context = NULL; 204 acpi_gbl_fixed_event_handlers[event].context = NULL;
205 205
206 if (ACPI_FAILURE(status)) { 206 if (ACPI_FAILURE(status)) {
207 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 207 ACPI_REPORT_WARNING(("Could not write to fixed event enable register %X\n", event));
208 "Could not write to fixed event enable register.\n"));
209 } else { 208 } else {
210 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X.\n", 209 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n",
211 event)); 210 event));
212 } 211 }
213 212
@@ -434,7 +433,7 @@ acpi_remove_notify_handler(acpi_handle device,
434 433
435 if (device == ACPI_ROOT_OBJECT) { 434 if (device == ACPI_ROOT_OBJECT) {
436 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 435 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
437 "Removing notify handler for ROOT object.\n")); 436 "Removing notify handler for namespace root object\n"));
438 437
439 if (((handler_type & ACPI_SYSTEM_NOTIFY) && 438 if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
440 !acpi_gbl_system_notify.handler) || 439 !acpi_gbl_system_notify.handler) ||
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index c1b898928256..90eb7939e986 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.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
@@ -70,8 +70,7 @@ acpi_status acpi_enable(void)
70 /* Make sure we have the FADT */ 70 /* Make sure we have the FADT */
71 71
72 if (!acpi_gbl_FADT) { 72 if (!acpi_gbl_FADT) {
73 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 73 ACPI_REPORT_WARNING(("No FADT information present!\n"));
74 "No FADT information present!\n"));
75 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 74 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
76 } 75 }
77 76
@@ -83,7 +82,7 @@ acpi_status acpi_enable(void)
83 82
84 status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI); 83 status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
85 if (ACPI_FAILURE(status)) { 84 if (ACPI_FAILURE(status)) {
86 ACPI_REPORT_ERROR(("Could not transition to ACPI mode.\n")); 85 ACPI_REPORT_ERROR(("Could not transition to ACPI mode\n"));
87 return_ACPI_STATUS(status); 86 return_ACPI_STATUS(status);
88 } 87 }
89 88
@@ -113,8 +112,7 @@ acpi_status acpi_disable(void)
113 ACPI_FUNCTION_TRACE("acpi_disable"); 112 ACPI_FUNCTION_TRACE("acpi_disable");
114 113
115 if (!acpi_gbl_FADT) { 114 if (!acpi_gbl_FADT) {
116 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 115 ACPI_REPORT_WARNING(("No FADT information present!\n"));
117 "No FADT information present!\n"));
118 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 116 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
119 } 117 }
120 118
@@ -127,8 +125,7 @@ acpi_status acpi_disable(void)
127 status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY); 125 status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY);
128 126
129 if (ACPI_FAILURE(status)) { 127 if (ACPI_FAILURE(status)) {
130 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 128 ACPI_REPORT_ERROR(("Could not exit ACPI mode to legacy mode"));
131 "Could not exit ACPI mode to legacy mode"));
132 return_ACPI_STATUS(status); 129 return_ACPI_STATUS(status);
133 } 130 }
134 131
@@ -185,9 +182,8 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
185 } 182 }
186 183
187 if (value != 1) { 184 if (value != 1) {
188 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 185 ACPI_REPORT_ERROR(("Could not enable %s event\n",
189 "Could not enable %s event\n", 186 acpi_ut_get_event_name(event)));
190 acpi_ut_get_event_name(event)));
191 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); 187 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
192 } 188 }
193 189
@@ -384,9 +380,8 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
384 } 380 }
385 381
386 if (value != 0) { 382 if (value != 0) {
387 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 383 ACPI_REPORT_ERROR(("Could not disable %s events\n",
388 "Could not disable %s events\n", 384 acpi_ut_get_event_name(event)));
389 acpi_ut_get_event_name(event)));
390 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); 385 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
391 } 386 }
392 387
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 6f28ea2db5ba..abf5caca9ae5 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 1ce365d651d8..109d0255a5bb 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.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
@@ -413,9 +413,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
413 (!ACPI_STRNCMP(table_ptr->signature, 413 (!ACPI_STRNCMP(table_ptr->signature,
414 acpi_gbl_table_data[ACPI_TABLE_SSDT].signature, 414 acpi_gbl_table_data[ACPI_TABLE_SSDT].signature,
415 acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) { 415 acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) {
416 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 416 ACPI_REPORT_ERROR(("Table has invalid signature [%4.4s], must be SSDT or PSDT\n", table_ptr->signature));
417 "Table has invalid signature [%4.4s], must be SSDT or PSDT\n",
418 table_ptr->signature));
419 status = AE_BAD_SIGNATURE; 417 status = AE_BAD_SIGNATURE;
420 goto cleanup; 418 goto cleanup;
421 } 419 }
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index fa9e75d4ec65..e6f55cf8ad31 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.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
@@ -654,17 +654,8 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
654 break; 654 break;
655 655
656 default: 656 default:
657 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 657 ACPI_REPORT_ERROR(("Unknown Target type ID 0x%X aml_opcode %X dest_type %s\n", GET_CURRENT_ARG_TYPE(walk_state->op_info->runtime_args), walk_state->opcode, acpi_ut_get_type_name(destination_type)));
658 "Unknown Target type ID 0x%X Op %s dest_type %s\n", 658 status = AE_AML_INTERNAL;
659 GET_CURRENT_ARG_TYPE(walk_state->op_info->
660 runtime_args),
661 walk_state->op_info->name,
662 acpi_ut_get_type_name(destination_type)));
663
664 ACPI_REPORT_ERROR(("Bad Target Type (ARGI): %X\n",
665 GET_CURRENT_ARG_TYPE(walk_state->op_info->
666 runtime_args)))
667 status = AE_AML_INTERNAL;
668 } 659 }
669 660
670 /* 661 /*
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 91c49188fb07..da313dad576a 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.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
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 17c79cd91b31..a7cca8d4f855 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.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
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index ab1ba399aa28..78a76f91a1c9 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.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
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index ba6e08843c29..9fe27fd04a2f 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.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
@@ -94,10 +94,9 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
94 /* We must have a valid region */ 94 /* We must have a valid region */
95 95
96 if (ACPI_GET_OBJECT_TYPE(rgn_desc) != ACPI_TYPE_REGION) { 96 if (ACPI_GET_OBJECT_TYPE(rgn_desc) != ACPI_TYPE_REGION) {
97 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 97 ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n",
98 "Needed Region, found type %X (%s)\n", 98 ACPI_GET_OBJECT_TYPE(rgn_desc),
99 ACPI_GET_OBJECT_TYPE(rgn_desc), 99 acpi_ut_get_object_type_name(rgn_desc)));
100 acpi_ut_get_object_type_name(rgn_desc)));
101 100
102 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 101 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
103 } 102 }
@@ -162,31 +161,14 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
162 * than the region itself. For example, a region of length one 161 * than the region itself. For example, a region of length one
163 * byte, and a field with Dword access specified. 162 * byte, and a field with Dword access specified.
164 */ 163 */
165 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 164 ACPI_REPORT_ERROR(("Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)\n", acpi_ut_get_node_name(obj_desc->common_field.node), obj_desc->common_field.access_byte_width, acpi_ut_get_node_name(rgn_desc->region.node), rgn_desc->region.length));
166 "Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)\n",
167 acpi_ut_get_node_name(obj_desc->
168 common_field.
169 node),
170 obj_desc->common_field.
171 access_byte_width,
172 acpi_ut_get_node_name(rgn_desc->
173 region.node),
174 rgn_desc->region.length));
175 } 165 }
176 166
177 /* 167 /*
178 * Offset rounded up to next multiple of field width 168 * Offset rounded up to next multiple of field width
179 * exceeds region length, indicate an error 169 * exceeds region length, indicate an error
180 */ 170 */
181 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 171 ACPI_REPORT_ERROR(("Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)\n", acpi_ut_get_node_name(obj_desc->common_field.node), obj_desc->common_field.base_byte_offset, field_datum_byte_offset, obj_desc->common_field.access_byte_width, acpi_ut_get_node_name(rgn_desc->region.node), rgn_desc->region.length));
182 "Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)\n",
183 acpi_ut_get_node_name(obj_desc->common_field.
184 node),
185 obj_desc->common_field.base_byte_offset,
186 field_datum_byte_offset,
187 obj_desc->common_field.access_byte_width,
188 acpi_ut_get_node_name(rgn_desc->region.node),
189 rgn_desc->region.length));
190 172
191 return_ACPI_STATUS(AE_AML_REGION_LIMIT); 173 return_ACPI_STATUS(AE_AML_REGION_LIMIT);
192 } 174 }
@@ -270,12 +252,11 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
270 252
271 if (ACPI_FAILURE(status)) { 253 if (ACPI_FAILURE(status)) {
272 if (status == AE_NOT_IMPLEMENTED) { 254 if (status == AE_NOT_IMPLEMENTED) {
273 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 255 ACPI_REPORT_ERROR(("Region %s(%X) not implemented\n",
274 "Region %s(%X) not implemented\n", 256 acpi_ut_get_region_name(rgn_desc->
275 acpi_ut_get_region_name(rgn_desc-> 257 region.
276 region. 258 space_id),
277 space_id), 259 rgn_desc->region.space_id));
278 rgn_desc->region.space_id));
279 } else if (status == AE_NOT_EXIST) { 260 } else if (status == AE_NOT_EXIST) {
280 ACPI_REPORT_ERROR(("Region %s(%X) has no handler\n", 261 ACPI_REPORT_ERROR(("Region %s(%X) has no handler\n",
281 acpi_ut_get_region_name(rgn_desc-> 262 acpi_ut_get_region_name(rgn_desc->
@@ -618,11 +599,10 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
618 599
619 default: 600 default:
620 601
621 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 602 ACPI_REPORT_ERROR(("Unknown update_rule value: %X\n",
622 "write_with_update_rule: Unknown update_rule setting: %X\n", 603 (obj_desc->common_field.
623 (obj_desc->common_field. 604 field_flags &
624 field_flags & 605 AML_FIELD_UPDATE_RULE_MASK)));
625 AML_FIELD_UPDATE_RULE_MASK)));
626 return_ACPI_STATUS(AE_AML_OPERAND_VALUE); 606 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
627 } 607 }
628 } 608 }
@@ -677,10 +657,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
677 657
678 if (buffer_length < 658 if (buffer_length <
679 ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) { 659 ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
680 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 660 ACPI_REPORT_ERROR(("Field size %X (bits) is too large for buffer (%X)\n", obj_desc->common_field.bit_length, buffer_length));
681 "Field size %X (bits) is too large for buffer (%X)\n",
682 obj_desc->common_field.bit_length,
683 buffer_length));
684 661
685 return_ACPI_STATUS(AE_BUFFER_OVERFLOW); 662 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
686 } 663 }
@@ -792,10 +769,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
792 769
793 if (buffer_length < 770 if (buffer_length <
794 ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) { 771 ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
795 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 772 ACPI_REPORT_ERROR(("Field size %X (bits) is too large for buffer (%X)\n", obj_desc->common_field.bit_length, buffer_length));
796 "Field size %X (bits) is too large for buffer (%X)\n",
797 obj_desc->common_field.bit_length,
798 buffer_length));
799 773
800 return_ACPI_STATUS(AE_BUFFER_OVERFLOW); 774 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
801 } 775 }
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index 0778bff632bf..5ad34566738c 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -98,7 +98,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
98 98
99 default: 99 default:
100 100
101 ACPI_REPORT_ERROR(("Unknown Reference opcode in get_reference %X\n", obj_desc->reference.opcode)); 101 ACPI_REPORT_ERROR(("Unknown Reference opcode %X\n",
102 obj_desc->reference.opcode));
102 return_ACPI_STATUS(AE_AML_INTERNAL); 103 return_ACPI_STATUS(AE_AML_INTERNAL);
103 } 104 }
104 break; 105 break;
@@ -113,7 +114,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
113 114
114 default: 115 default:
115 116
116 ACPI_REPORT_ERROR(("Invalid descriptor type in get_reference: %X\n", ACPI_GET_DESCRIPTOR_TYPE(obj_desc))); 117 ACPI_REPORT_ERROR(("Invalid descriptor type %X\n",
118 ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
117 return_ACPI_STATUS(AE_TYPE); 119 return_ACPI_STATUS(AE_TYPE);
118 } 120 }
119 121
@@ -266,7 +268,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
266 break; 268 break;
267 269
268 default: 270 default:
269 ACPI_REPORT_ERROR(("Concatanate - invalid object type: %X\n", 271 ACPI_REPORT_ERROR(("Invalid object type: %X\n",
270 ACPI_GET_OBJECT_TYPE(operand0))); 272 ACPI_GET_OBJECT_TYPE(operand0)));
271 status = AE_AML_INTERNAL; 273 status = AE_AML_INTERNAL;
272 } 274 }
@@ -368,7 +370,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
368 370
369 /* Invalid object type, should not happen here */ 371 /* Invalid object type, should not happen here */
370 372
371 ACPI_REPORT_ERROR(("Concatenate - Invalid object type: %X\n", 373 ACPI_REPORT_ERROR(("Invalid object type: %X\n",
372 ACPI_GET_OBJECT_TYPE(operand0))); 374 ACPI_GET_OBJECT_TYPE(operand0)));
373 status = AE_AML_INTERNAL; 375 status = AE_AML_INTERNAL;
374 goto cleanup; 376 goto cleanup;
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index ab47f6d8b5c0..89b8ab79410b 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 7bb5e17b5680..de3216b6a4fc 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -99,7 +99,8 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
99 */ 99 */
100 name_string = ACPI_MEM_ALLOCATE(size_needed); 100 name_string = ACPI_MEM_ALLOCATE(size_needed);
101 if (!name_string) { 101 if (!name_string) {
102 ACPI_REPORT_ERROR(("ex_allocate_name_string: Could not allocate size %d\n", size_needed)); 102 ACPI_REPORT_ERROR(("Could not allocate size %d\n",
103 size_needed));
103 return_PTR(NULL); 104 return_PTR(NULL);
104 } 105 }
105 106
@@ -167,8 +168,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
167 char_buf[0] = *aml_address; 168 char_buf[0] = *aml_address;
168 169
169 if ('0' <= char_buf[0] && char_buf[0] <= '9') { 170 if ('0' <= char_buf[0] && char_buf[0] <= '9') {
170 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "leading digit: %c\n", 171 ACPI_REPORT_ERROR(("Invalid leading digit: %c\n", char_buf[0]));
171 char_buf[0]));
172 return_ACPI_STATUS(AE_CTRL_PENDING); 172 return_ACPI_STATUS(AE_CTRL_PENDING);
173 } 173 }
174 174
@@ -211,9 +211,8 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
211 * the required 4 211 * the required 4
212 */ 212 */
213 status = AE_AML_BAD_NAME; 213 status = AE_AML_BAD_NAME;
214 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 214 ACPI_REPORT_ERROR(("Bad character %02x in name, at %p\n",
215 "Bad character %02x in name, at %p\n", 215 *aml_address, aml_address));
216 *aml_address, aml_address));
217 } 216 }
218 217
219 *in_aml_address = ACPI_CAST_PTR(u8, aml_address); 218 *in_aml_address = ACPI_CAST_PTR(u8, aml_address);
@@ -412,8 +411,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
412 if (AE_CTRL_PENDING == status && has_prefix) { 411 if (AE_CTRL_PENDING == status && has_prefix) {
413 /* Ran out of segments after processing a prefix */ 412 /* Ran out of segments after processing a prefix */
414 413
415 ACPI_REPORT_ERROR(("ex_do_name: Malformed Name at %p\n", 414 ACPI_REPORT_ERROR(("Malformed Name at %p\n", name_string));
416 name_string));
417 status = AE_AML_BAD_NAME; 415 status = AE_AML_BAD_NAME;
418 } 416 }
419 417
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 97e34542f5e4..bc8837ecb716 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -111,7 +111,8 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
111 111
112 default: /* Unknown opcode */ 112 default: /* Unknown opcode */
113 113
114 ACPI_REPORT_ERROR(("acpi_ex_opcode_0A_0T_1R: Unknown opcode %X\n", walk_state->opcode)); 114 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
115 walk_state->opcode));
115 status = AE_AML_BAD_OPCODE; 116 status = AE_AML_BAD_OPCODE;
116 break; 117 break;
117 } 118 }
@@ -188,7 +189,8 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)
188 189
189 default: /* Unknown opcode */ 190 default: /* Unknown opcode */
190 191
191 ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_0R: Unknown opcode %X\n", walk_state->opcode)); 192 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
193 walk_state->opcode));
192 status = AE_AML_BAD_OPCODE; 194 status = AE_AML_BAD_OPCODE;
193 break; 195 break;
194 } 196 }
@@ -227,7 +229,8 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)
227 229
228 default: /* Unknown opcode */ 230 default: /* Unknown opcode */
229 231
230 ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_0R: Unknown opcode %X\n", walk_state->opcode)); 232 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
233 walk_state->opcode));
231 status = AE_AML_BAD_OPCODE; 234 status = AE_AML_BAD_OPCODE;
232 goto cleanup; 235 goto cleanup;
233 } 236 }
@@ -346,9 +349,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
346 /* Check the range of the digit */ 349 /* Check the range of the digit */
347 350
348 if (temp32 > 9) { 351 if (temp32 > 9) {
349 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 352 ACPI_REPORT_ERROR(("BCD digit too large (not decimal): 0x%X\n", temp32));
350 "BCD digit too large (not decimal): 0x%X\n",
351 temp32));
352 353
353 status = AE_AML_NUMERIC_OVERFLOW; 354 status = AE_AML_NUMERIC_OVERFLOW;
354 goto cleanup; 355 goto cleanup;
@@ -393,12 +394,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
393 /* Overflow if there is any data left in Digit */ 394 /* Overflow if there is any data left in Digit */
394 395
395 if (digit > 0) { 396 if (digit > 0) {
396 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 397 ACPI_REPORT_ERROR(("Integer too large to convert to BCD: %8.8X%8.8X\n", ACPI_FORMAT_UINT64(operand[0]->integer.value)));
397 "Integer too large to convert to BCD: %8.8X%8.8X\n",
398 ACPI_FORMAT_UINT64(operand
399 [0]->
400 integer.
401 value)));
402 status = AE_AML_NUMERIC_OVERFLOW; 398 status = AE_AML_NUMERIC_OVERFLOW;
403 goto cleanup; 399 goto cleanup;
404 } 400 }
@@ -525,15 +521,16 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
525 521
526 /* These are two obsolete opcodes */ 522 /* These are two obsolete opcodes */
527 523
528 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 524 ACPI_REPORT_ERROR(("%s is obsolete and not implemented\n",
529 "%s is obsolete and not implemented\n", 525 acpi_ps_get_opcode_name(walk_state->
530 acpi_ps_get_opcode_name(walk_state->opcode))); 526 opcode)));
531 status = AE_SUPPORT; 527 status = AE_SUPPORT;
532 goto cleanup; 528 goto cleanup;
533 529
534 default: /* Unknown opcode */ 530 default: /* Unknown opcode */
535 531
536 ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_1R: Unknown opcode %X\n", walk_state->opcode)); 532 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
533 walk_state->opcode));
537 status = AE_AML_BAD_OPCODE; 534 status = AE_AML_BAD_OPCODE;
538 goto cleanup; 535 goto cleanup;
539 } 536 }
@@ -639,11 +636,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
639 acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc, 636 acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc,
640 walk_state); 637 walk_state);
641 if (ACPI_FAILURE(status)) { 638 if (ACPI_FAILURE(status)) {
642 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 639 ACPI_REPORT_ERROR(("%s: bad operand(s) %s\n",
643 "%s: bad operand(s) %s\n", 640 acpi_ps_get_opcode_name(walk_state->
644 acpi_ps_get_opcode_name(walk_state-> 641 opcode),
645 opcode), 642 acpi_format_exception(status)));
646 acpi_format_exception(status)));
647 643
648 goto cleanup; 644 goto cleanup;
649 } 645 }
@@ -742,9 +738,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
742 break; 738 break;
743 739
744 default: 740 default:
745 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 741 ACPI_REPORT_ERROR(("Operand is not Buf/Int/Str/Pkg - found type %s\n", acpi_ut_get_type_name(type)));
746 "size_of - Operand is not Buf/Int/Str/Pkg - found type %s\n",
747 acpi_ut_get_type_name(type)));
748 status = AE_AML_OPERAND_TYPE; 742 status = AE_AML_OPERAND_TYPE;
749 goto cleanup; 743 goto cleanup;
750 } 744 }
@@ -941,11 +935,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
941 935
942 default: 936 default:
943 937
944 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 938 ACPI_REPORT_ERROR(("Unknown Index target_type %X in obj %p\n", operand[0]->reference.target_type, operand[0]));
945 "Unknown Index target_type %X in obj %p\n",
946 operand[0]->reference.
947 target_type,
948 operand[0]));
949 status = AE_AML_OPERAND_TYPE; 939 status = AE_AML_OPERAND_TYPE;
950 goto cleanup; 940 goto cleanup;
951 } 941 }
@@ -971,11 +961,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
971 break; 961 break;
972 962
973 default: 963 default:
974 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 964 ACPI_REPORT_ERROR(("Unknown opcode in ref(%p) - %X\n", operand[0], operand[0]->reference.opcode));
975 "Unknown opcode in ref(%p) - %X\n",
976 operand[0],
977 operand[0]->reference.
978 opcode));
979 965
980 status = AE_TYPE; 966 status = AE_TYPE;
981 goto cleanup; 967 goto cleanup;
@@ -985,7 +971,8 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
985 971
986 default: 972 default:
987 973
988 ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_1R: Unknown opcode %X\n", walk_state->opcode)); 974 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
975 walk_state->opcode));
989 status = AE_AML_BAD_OPCODE; 976 status = AE_AML_BAD_OPCODE;
990 goto cleanup; 977 goto cleanup;
991 } 978 }
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index d8472842c1fd..7c59dda40946 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.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
@@ -111,9 +111,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
111 /* Are notifies allowed on this object? */ 111 /* Are notifies allowed on this object? */
112 112
113 if (!acpi_ev_is_notify_object(node)) { 113 if (!acpi_ev_is_notify_object(node)) {
114 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 114 ACPI_REPORT_ERROR(("Unexpected notify object type [%s]\n", acpi_ut_get_type_name(node->type)));
115 "Unexpected notify object type [%s]\n",
116 acpi_ut_get_type_name(node->type)));
117 115
118 status = AE_AML_OPERAND_TYPE; 116 status = AE_AML_OPERAND_TYPE;
119 break; 117 break;
@@ -157,7 +155,8 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
157 155
158 default: 156 default:
159 157
160 ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_0T_0R: Unknown opcode %X\n", walk_state->opcode)); 158 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
159 walk_state->opcode));
161 status = AE_AML_BAD_OPCODE; 160 status = AE_AML_BAD_OPCODE;
162 } 161 }
163 162
@@ -221,7 +220,8 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
221 220
222 default: 221 default:
223 222
224 ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_2T_1R: Unknown opcode %X\n", walk_state->opcode)); 223 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
224 walk_state->opcode));
225 status = AE_AML_BAD_OPCODE; 225 status = AE_AML_BAD_OPCODE;
226 goto cleanup; 226 goto cleanup;
227 } 227 }
@@ -389,10 +389,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
389 /* Object to be indexed is a Package */ 389 /* Object to be indexed is a Package */
390 390
391 if (index >= operand[0]->package.count) { 391 if (index >= operand[0]->package.count) {
392 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 392 ACPI_REPORT_ERROR(("Index value (%X%8.8X) beyond package end (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->package.count));
393 "Index value (%X%8.8X) beyond package end (%X)\n",
394 ACPI_FORMAT_UINT64(index),
395 operand[0]->package.count));
396 status = AE_AML_PACKAGE_LIMIT; 393 status = AE_AML_PACKAGE_LIMIT;
397 goto cleanup; 394 goto cleanup;
398 } 395 }
@@ -405,10 +402,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
405 /* Object to be indexed is a Buffer/String */ 402 /* Object to be indexed is a Buffer/String */
406 403
407 if (index >= operand[0]->buffer.length) { 404 if (index >= operand[0]->buffer.length) {
408 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 405 ACPI_REPORT_ERROR(("Index value (%X%8.8X) beyond end of buffer (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->buffer.length));
409 "Index value (%X%8.8X) beyond end of buffer (%X)\n",
410 ACPI_FORMAT_UINT64(index),
411 operand[0]->buffer.length));
412 status = AE_AML_BUFFER_LIMIT; 406 status = AE_AML_BUFFER_LIMIT;
413 goto cleanup; 407 goto cleanup;
414 } 408 }
@@ -440,7 +434,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
440 434
441 default: 435 default:
442 436
443 ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_1T_1R: Unknown opcode %X\n", walk_state->opcode)); 437 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
438 walk_state->opcode));
444 status = AE_AML_BAD_OPCODE; 439 status = AE_AML_BAD_OPCODE;
445 break; 440 break;
446 } 441 }
@@ -544,7 +539,8 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
544 539
545 default: 540 default:
546 541
547 ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_0T_1R: Unknown opcode %X\n", walk_state->opcode)); 542 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
543 walk_state->opcode));
548 status = AE_AML_BAD_OPCODE; 544 status = AE_AML_BAD_OPCODE;
549 goto cleanup; 545 goto cleanup;
550 } 546 }
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 2ea1c322970b..a979b338a491 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -119,7 +119,8 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
119 119
120 default: 120 default:
121 121
122 ACPI_REPORT_ERROR(("acpi_ex_opcode_3A_0T_0R: Unknown opcode %X\n", walk_state->opcode)); 122 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
123 walk_state->opcode));
123 status = AE_AML_BAD_OPCODE; 124 status = AE_AML_BAD_OPCODE;
124 goto cleanup; 125 goto cleanup;
125 } 126 }
@@ -242,7 +243,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
242 243
243 default: 244 default:
244 245
245 ACPI_REPORT_ERROR(("acpi_ex_opcode_3A_0T_0R: Unknown opcode %X\n", walk_state->opcode)); 246 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
247 walk_state->opcode));
246 status = AE_AML_BAD_OPCODE; 248 status = AE_AML_BAD_OPCODE;
247 goto cleanup; 249 goto cleanup;
248 } 250 }
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index 5dee77139576..05e7f9b67f29 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -234,8 +234,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
234 234
235 if ((operand[1]->integer.value > MAX_MATCH_OPERATOR) || 235 if ((operand[1]->integer.value > MAX_MATCH_OPERATOR) ||
236 (operand[3]->integer.value > MAX_MATCH_OPERATOR)) { 236 (operand[3]->integer.value > MAX_MATCH_OPERATOR)) {
237 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 237 ACPI_REPORT_ERROR(("Match operator out of range\n"));
238 "Match operator out of range\n"));
239 status = AE_AML_OPERAND_VALUE; 238 status = AE_AML_OPERAND_VALUE;
240 goto cleanup; 239 goto cleanup;
241 } 240 }
@@ -244,10 +243,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
244 243
245 index = operand[5]->integer.value; 244 index = operand[5]->integer.value;
246 if (index >= operand[0]->package.count) { 245 if (index >= operand[0]->package.count) {
247 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 246 ACPI_REPORT_ERROR(("Index (%X%8.8X) beyond package end (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->package.count));
248 "Index (%X%8.8X) beyond package end (%X)\n",
249 ACPI_FORMAT_UINT64(index),
250 operand[0]->package.count));
251 status = AE_AML_PACKAGE_LIMIT; 247 status = AE_AML_PACKAGE_LIMIT;
252 goto cleanup; 248 goto cleanup;
253 } 249 }
@@ -316,7 +312,8 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
316 312
317 default: 313 default:
318 314
319 ACPI_REPORT_ERROR(("acpi_ex_opcode_6A_0T_1R: Unknown opcode %X\n", walk_state->opcode)); 315 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
316 walk_state->opcode));
320 status = AE_AML_BAD_OPCODE; 317 status = AE_AML_BAD_OPCODE;
321 goto cleanup; 318 goto cleanup;
322 } 319 }
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 88ccbf3b29d0..3bde780c94cf 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -274,8 +274,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
274 default: 274 default:
275 /* Invalid field access type */ 275 /* Invalid field access type */
276 276
277 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 277 ACPI_REPORT_ERROR(("Unknown field access type %X\n", access));
278 "Unknown field access type %X\n", access));
279 return_UINT32(0); 278 return_UINT32(0);
280 } 279 }
281 280
@@ -422,15 +421,13 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
422 421
423 if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) { 422 if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) {
424 if (!info->region_node) { 423 if (!info->region_node) {
425 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null region_node\n")); 424 ACPI_REPORT_ERROR(("Null region_node\n"));
426 return_ACPI_STATUS(AE_AML_NO_OPERAND); 425 return_ACPI_STATUS(AE_AML_NO_OPERAND);
427 } 426 }
428 427
429 type = acpi_ns_get_type(info->region_node); 428 type = acpi_ns_get_type(info->region_node);
430 if (type != ACPI_TYPE_REGION) { 429 if (type != ACPI_TYPE_REGION) {
431 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 430 ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n", type, acpi_ut_get_type_name(type)));
432 "Needed Region, found type %X (%s)\n",
433 type, acpi_ut_get_type_name(type)));
434 431
435 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 432 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
436 } 433 }
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 80118be3f544..82983575cca6 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -103,9 +103,8 @@ acpi_ex_system_memory_space_handler(u32 function,
103 break; 103 break;
104 104
105 default: 105 default:
106 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 106 ACPI_REPORT_ERROR(("Invalid system_memory width %d\n",
107 "Invalid system_memory width %d\n", 107 bit_width));
108 bit_width));
109 return_ACPI_STATUS(AE_AML_OPERAND_VALUE); 108 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
110 } 109 }
111 110
@@ -159,10 +158,7 @@ acpi_ex_system_memory_space_handler(u32 function,
159 (void **)&mem_info-> 158 (void **)&mem_info->
160 mapped_logical_address); 159 mapped_logical_address);
161 if (ACPI_FAILURE(status)) { 160 if (ACPI_FAILURE(status)) {
162 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 161 ACPI_REPORT_ERROR(("Could not map memory at %8.8X%8.8X, size %X\n", ACPI_FORMAT_UINT64(address), (u32) window_size));
163 "Could not map memory at %8.8X%8.8X, size %X\n",
164 ACPI_FORMAT_UINT64(address),
165 (u32) window_size));
166 mem_info->mapped_length = 0; 162 mem_info->mapped_length = 0;
167 return_ACPI_STATUS(status); 163 return_ACPI_STATUS(status);
168 } 164 }
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index ff5d8f97e8eb..a5cca7eda210 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -122,8 +122,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
122 } 122 }
123 123
124 if (!source_desc) { 124 if (!source_desc) {
125 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 125 ACPI_REPORT_ERROR(("No object attached to node %p\n", node));
126 "No object attached to node %p\n", node));
127 return_ACPI_STATUS(AE_AML_NO_OPERAND); 126 return_ACPI_STATUS(AE_AML_NO_OPERAND);
128 } 127 }
129 128
@@ -135,10 +134,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
135 case ACPI_TYPE_PACKAGE: 134 case ACPI_TYPE_PACKAGE:
136 135
137 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_PACKAGE) { 136 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_PACKAGE) {
138 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 137 ACPI_REPORT_ERROR(("Object not a Package, type %s\n",
139 "Object not a Package, type %s\n", 138 acpi_ut_get_object_type_name
140 acpi_ut_get_object_type_name 139 (source_desc)));
141 (source_desc)));
142 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 140 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
143 } 141 }
144 142
@@ -154,10 +152,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
154 case ACPI_TYPE_BUFFER: 152 case ACPI_TYPE_BUFFER:
155 153
156 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) { 154 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) {
157 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 155 ACPI_REPORT_ERROR(("Object not a Buffer, type %s\n",
158 "Object not a Buffer, type %s\n", 156 acpi_ut_get_object_type_name
159 acpi_ut_get_object_type_name 157 (source_desc)));
160 (source_desc)));
161 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 158 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
162 } 159 }
163 160
@@ -173,10 +170,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
173 case ACPI_TYPE_STRING: 170 case ACPI_TYPE_STRING:
174 171
175 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_STRING) { 172 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_STRING) {
176 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 173 ACPI_REPORT_ERROR(("Object not a String, type %s\n",
177 "Object not a String, type %s\n", 174 acpi_ut_get_object_type_name
178 acpi_ut_get_object_type_name 175 (source_desc)));
179 (source_desc)));
180 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 176 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
181 } 177 }
182 178
@@ -189,10 +185,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
189 case ACPI_TYPE_INTEGER: 185 case ACPI_TYPE_INTEGER:
190 186
191 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_INTEGER) { 187 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_INTEGER) {
192 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 188 ACPI_REPORT_ERROR(("Object not a Integer, type %s\n",
193 "Object not a Integer, type %s\n", 189 acpi_ut_get_object_type_name
194 acpi_ut_get_object_type_name 190 (source_desc)));
195 (source_desc)));
196 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 191 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
197 } 192 }
198 193
@@ -236,9 +231,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
236 231
237 case ACPI_TYPE_ANY: 232 case ACPI_TYPE_ANY:
238 233
239 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 234 ACPI_REPORT_ERROR(("Untyped entry %p, no attached object!\n",
240 "Untyped entry %p, no attached object!\n", 235 node));
241 node));
242 236
243 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); /* Cannot be AE_TYPE */ 237 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); /* Cannot be AE_TYPE */
244 238
@@ -257,12 +251,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
257 default: 251 default:
258 /* No named references are allowed here */ 252 /* No named references are allowed here */
259 253
260 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 254 ACPI_REPORT_ERROR(("Unsupported Reference opcode %X (%s)\n", source_desc->reference.opcode, acpi_ps_get_opcode_name(source_desc->reference.opcode)));
261 "Unsupported Reference opcode %X (%s)\n",
262 source_desc->reference.opcode,
263 acpi_ps_get_opcode_name(source_desc->
264 reference.
265 opcode)));
266 255
267 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 256 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
268 } 257 }
@@ -272,9 +261,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
272 261
273 /* Default case is for unknown types */ 262 /* Default case is for unknown types */
274 263
275 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 264 ACPI_REPORT_ERROR(("Node %p - Unknown object type %X\n",
276 "Node %p - Unknown object type %X\n", 265 node, entry_type));
277 node, entry_type));
278 266
279 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 267 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
280 268
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 97eecbd3242d..ae2d2da00844 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -81,7 +81,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
81 ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr); 81 ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr);
82 82
83 if (!stack_ptr || !*stack_ptr) { 83 if (!stack_ptr || !*stack_ptr) {
84 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Internal - null pointer\n")); 84 ACPI_REPORT_ERROR(("Internal - null pointer\n"));
85 return_ACPI_STATUS(AE_AML_NO_OPERAND); 85 return_ACPI_STATUS(AE_AML_NO_OPERAND);
86 } 86 }
87 87
@@ -97,8 +97,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
97 } 97 }
98 98
99 if (!*stack_ptr) { 99 if (!*stack_ptr) {
100 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 100 ACPI_REPORT_ERROR(("Internal - null pointer\n"));
101 "Internal - null pointer\n"));
102 return_ACPI_STATUS(AE_AML_NO_OPERAND); 101 return_ACPI_STATUS(AE_AML_NO_OPERAND);
103 } 102 }
104 } 103 }
@@ -228,9 +227,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
228 * A NULL object descriptor means an unitialized element of 227 * A NULL object descriptor means an unitialized element of
229 * the package, can't dereference it 228 * the package, can't dereference it
230 */ 229 */
231 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 230 ACPI_REPORT_ERROR(("Attempt to deref an Index to NULL pkg element Idx=%p\n", stack_desc));
232 "Attempt to deref an Index to NULL pkg element Idx=%p\n",
233 stack_desc));
234 status = AE_AML_UNINITIALIZED_ELEMENT; 231 status = AE_AML_UNINITIALIZED_ELEMENT;
235 } 232 }
236 break; 233 break;
@@ -239,7 +236,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
239 236
240 /* Invalid reference object */ 237 /* Invalid reference object */
241 238
242 ACPI_REPORT_ERROR(("During resolve, Unknown target_type %X in Index/Reference obj %p\n", stack_desc->reference.target_type, stack_desc)); 239 ACPI_REPORT_ERROR(("Unknown target_type %X in Index/Reference obj %p\n", stack_desc->reference.target_type, stack_desc));
243 status = AE_AML_INTERNAL; 240 status = AE_AML_INTERNAL;
244 break; 241 break;
245 } 242 }
@@ -264,7 +261,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
264 261
265 default: 262 default:
266 263
267 ACPI_REPORT_ERROR(("During resolve, Unknown Reference opcode %X (%s) in %p\n", opcode, acpi_ps_get_opcode_name(opcode), stack_desc)); 264 ACPI_REPORT_ERROR(("Unknown Reference opcode %X (%s) in %p\n", opcode, acpi_ps_get_opcode_name(opcode), stack_desc));
268 status = AE_AML_INTERNAL; 265 status = AE_AML_INTERNAL;
269 break; 266 break;
270 } 267 }
@@ -386,7 +383,10 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
386 383
387 if (ACPI_GET_DESCRIPTOR_TYPE(node) != 384 if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
388 ACPI_DESC_TYPE_NAMED) { 385 ACPI_DESC_TYPE_NAMED) {
389 ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Not a NS node %p [%s]\n", node, acpi_ut_get_descriptor_name(node))); 386 ACPI_REPORT_ERROR(("Not a NS node %p [%s]\n",
387 node,
388 acpi_ut_get_descriptor_name
389 (node)));
390 return_ACPI_STATUS(AE_AML_INTERNAL); 390 return_ACPI_STATUS(AE_AML_INTERNAL);
391 } 391 }
392 392
@@ -442,7 +442,10 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
442 442
443 if (ACPI_GET_DESCRIPTOR_TYPE(node) != 443 if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
444 ACPI_DESC_TYPE_NAMED) { 444 ACPI_DESC_TYPE_NAMED) {
445 ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Not a NS node %p [%s]\n", node, acpi_ut_get_descriptor_name(node))); 445 ACPI_REPORT_ERROR(("Not a NS node %p [%s]\n",
446 node,
447 acpi_ut_get_descriptor_name
448 (node)));
446 return_ACPI_STATUS(AE_AML_INTERNAL); 449 return_ACPI_STATUS(AE_AML_INTERNAL);
447 } 450 }
448 451
@@ -511,7 +514,8 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
511 514
512 default: 515 default:
513 516
514 ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Unknown Reference subtype %X\n", obj_desc->reference.opcode)); 517 ACPI_REPORT_ERROR(("Unknown Reference subtype %X\n",
518 obj_desc->reference.opcode));
515 return_ACPI_STATUS(AE_AML_INTERNAL); 519 return_ACPI_STATUS(AE_AML_INTERNAL);
516 } 520 }
517 } 521 }
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index b04e4a3707a1..804faebf825c 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@ static acpi_status
73acpi_ex_check_object_type(acpi_object_type type_needed, 73acpi_ex_check_object_type(acpi_object_type type_needed,
74 acpi_object_type this_type, void *object) 74 acpi_object_type this_type, void *object)
75{ 75{
76 ACPI_FUNCTION_NAME("ex_check_object_type"); 76 ACPI_FUNCTION_ENTRY();
77 77
78 if (type_needed == ACPI_TYPE_ANY) { 78 if (type_needed == ACPI_TYPE_ANY) {
79 /* All types OK, so we don't perform any typechecks */ 79 /* All types OK, so we don't perform any typechecks */
@@ -95,10 +95,9 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
95 } 95 }
96 96
97 if (type_needed != this_type) { 97 if (type_needed != this_type) {
98 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 98 ACPI_REPORT_ERROR(("Needed type [%s], found [%s] %p\n",
99 "Needed [%s], found [%s] %p\n", 99 acpi_ut_get_type_name(type_needed),
100 acpi_ut_get_type_name(type_needed), 100 acpi_ut_get_type_name(this_type), object));
101 acpi_ut_get_type_name(this_type), object));
102 101
103 return (AE_AML_OPERAND_TYPE); 102 return (AE_AML_OPERAND_TYPE);
104 } 103 }
@@ -151,7 +150,7 @@ acpi_ex_resolve_operands(u16 opcode,
151 150
152 arg_types = op_info->runtime_args; 151 arg_types = op_info->runtime_args;
153 if (arg_types == ARGI_INVALID_OPCODE) { 152 if (arg_types == ARGI_INVALID_OPCODE) {
154 ACPI_REPORT_ERROR(("resolve_operands: %X is not a valid AML opcode\n", opcode)); 153 ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", opcode));
155 154
156 return_ACPI_STATUS(AE_AML_INTERNAL); 155 return_ACPI_STATUS(AE_AML_INTERNAL);
157 } 156 }
@@ -169,7 +168,8 @@ acpi_ex_resolve_operands(u16 opcode,
169 */ 168 */
170 while (GET_CURRENT_ARG_TYPE(arg_types)) { 169 while (GET_CURRENT_ARG_TYPE(arg_types)) {
171 if (!stack_ptr || !*stack_ptr) { 170 if (!stack_ptr || !*stack_ptr) {
172 ACPI_REPORT_ERROR(("resolve_operands: Null stack entry at %p\n", stack_ptr)); 171 ACPI_REPORT_ERROR(("Null stack entry at %p\n",
172 stack_ptr));
173 173
174 return_ACPI_STATUS(AE_AML_INTERNAL); 174 return_ACPI_STATUS(AE_AML_INTERNAL);
175 } 175 }
@@ -198,9 +198,7 @@ acpi_ex_resolve_operands(u16 opcode,
198 /* Check for bad acpi_object_type */ 198 /* Check for bad acpi_object_type */
199 199
200 if (!acpi_ut_valid_object_type(object_type)) { 200 if (!acpi_ut_valid_object_type(object_type)) {
201 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 201 ACPI_REPORT_ERROR(("Bad operand object type [%X]\n", object_type));
202 "Bad operand object type [%X]\n",
203 object_type));
204 202
205 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 203 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
206 } 204 }
@@ -238,13 +236,7 @@ acpi_ex_resolve_operands(u16 opcode,
238 break; 236 break;
239 237
240 default: 238 default:
241 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 239 ACPI_REPORT_ERROR(("Operand is a Reference, Unknown Reference Opcode: %X\n", obj_desc->reference.opcode));
242 "Operand is a Reference, Unknown Reference Opcode %X [%s]\n",
243 obj_desc->reference.
244 opcode,
245 (acpi_ps_get_opcode_info
246 (obj_desc->reference.
247 opcode))->name));
248 240
249 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 241 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
250 } 242 }
@@ -255,11 +247,10 @@ acpi_ex_resolve_operands(u16 opcode,
255 247
256 /* Invalid descriptor */ 248 /* Invalid descriptor */
257 249
258 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 250 ACPI_REPORT_ERROR(("Invalid descriptor %p [%s]\n",
259 "Invalid descriptor %p [%s]\n", 251 obj_desc,
260 obj_desc, 252 acpi_ut_get_descriptor_name
261 acpi_ut_get_descriptor_name 253 (obj_desc)));
262 (obj_desc)));
263 254
264 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 255 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
265 } 256 }
@@ -417,11 +408,7 @@ acpi_ex_resolve_operands(u16 opcode,
417 acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16); 408 acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16);
418 if (ACPI_FAILURE(status)) { 409 if (ACPI_FAILURE(status)) {
419 if (status == AE_TYPE) { 410 if (status == AE_TYPE) {
420 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 411 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
421 "Needed [Integer/String/Buffer], found [%s] %p\n",
422 acpi_ut_get_object_type_name
423 (obj_desc),
424 obj_desc));
425 412
426 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 413 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
427 } 414 }
@@ -444,11 +431,7 @@ acpi_ex_resolve_operands(u16 opcode,
444 status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr); 431 status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr);
445 if (ACPI_FAILURE(status)) { 432 if (ACPI_FAILURE(status)) {
446 if (status == AE_TYPE) { 433 if (status == AE_TYPE) {
447 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 434 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
448 "Needed [Integer/String/Buffer], found [%s] %p\n",
449 acpi_ut_get_object_type_name
450 (obj_desc),
451 obj_desc));
452 435
453 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 436 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
454 } 437 }
@@ -472,11 +455,7 @@ acpi_ex_resolve_operands(u16 opcode,
472 ACPI_IMPLICIT_CONVERT_HEX); 455 ACPI_IMPLICIT_CONVERT_HEX);
473 if (ACPI_FAILURE(status)) { 456 if (ACPI_FAILURE(status)) {
474 if (status == AE_TYPE) { 457 if (status == AE_TYPE) {
475 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 458 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
476 "Needed [Integer/String/Buffer], found [%s] %p\n",
477 acpi_ut_get_object_type_name
478 (obj_desc),
479 obj_desc));
480 459
481 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 460 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
482 } 461 }
@@ -502,10 +481,7 @@ acpi_ex_resolve_operands(u16 opcode,
502 break; 481 break;
503 482
504 default: 483 default:
505 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 484 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
506 "Needed [Integer/String/Buffer], found [%s] %p\n",
507 acpi_ut_get_object_type_name
508 (obj_desc), obj_desc));
509 485
510 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 486 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
511 } 487 }
@@ -539,10 +515,7 @@ acpi_ex_resolve_operands(u16 opcode,
539 break; 515 break;
540 516
541 default: 517 default:
542 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 518 ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
543 "Needed [Integer/String/Buffer], found [%s] %p\n",
544 acpi_ut_get_object_type_name
545 (obj_desc), obj_desc));
546 519
547 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 520 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
548 } 521 }
@@ -566,10 +539,7 @@ acpi_ex_resolve_operands(u16 opcode,
566 break; 539 break;
567 540
568 default: 541 default:
569 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 542 ACPI_REPORT_ERROR(("Needed [Buffer/String/Package/Reference], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
570 "Needed [Buffer/String/Package/Reference], found [%s] %p\n",
571 acpi_ut_get_object_type_name
572 (obj_desc), obj_desc));
573 543
574 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 544 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
575 } 545 }
@@ -588,10 +558,7 @@ acpi_ex_resolve_operands(u16 opcode,
588 break; 558 break;
589 559
590 default: 560 default:
591 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 561 ACPI_REPORT_ERROR(("Needed [Buffer/String/Package], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
592 "Needed [Buffer/String/Package], found [%s] %p\n",
593 acpi_ut_get_object_type_name
594 (obj_desc), obj_desc));
595 562
596 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 563 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
597 } 564 }
@@ -611,10 +578,7 @@ acpi_ex_resolve_operands(u16 opcode,
611 break; 578 break;
612 579
613 default: 580 default:
614 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 581 ACPI_REPORT_ERROR(("Needed [Region/region_field], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
615 "Needed [Region/region_field], found [%s] %p\n",
616 acpi_ut_get_object_type_name
617 (obj_desc), obj_desc));
618 582
619 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 583 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
620 } 584 }
@@ -656,10 +620,7 @@ acpi_ex_resolve_operands(u16 opcode,
656 break; 620 break;
657 } 621 }
658 622
659 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 623 ACPI_REPORT_ERROR(("Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
660 "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n",
661 acpi_ut_get_object_type_name
662 (obj_desc), obj_desc));
663 624
664 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 625 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
665 } 626 }
@@ -669,9 +630,7 @@ acpi_ex_resolve_operands(u16 opcode,
669 630
670 /* Unknown type */ 631 /* Unknown type */
671 632
672 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 633 ACPI_REPORT_ERROR(("Internal - Unknown ARGI (required operand) type %X\n", this_arg_type));
673 "Internal - Unknown ARGI (required operand) type %X\n",
674 this_arg_type));
675 634
676 return_ACPI_STATUS(AE_BAD_PARAMETER); 635 return_ACPI_STATUS(AE_BAD_PARAMETER);
677 } 636 }
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index a7d8eea305c2..202ebe1eb957 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -250,7 +250,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
250 /* Validate parameters */ 250 /* Validate parameters */
251 251
252 if (!source_desc || !dest_desc) { 252 if (!source_desc || !dest_desc) {
253 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null parameter\n")); 253 ACPI_REPORT_ERROR(("Null parameter\n"));
254 return_ACPI_STATUS(AE_AML_NO_OPERAND); 254 return_ACPI_STATUS(AE_AML_NO_OPERAND);
255 } 255 }
256 256
@@ -290,10 +290,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
290 290
291 /* Destination is not a Reference object */ 291 /* Destination is not a Reference object */
292 292
293 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 293 ACPI_REPORT_ERROR(("Target is not a Reference or Constant object - %s [%p]\n", acpi_ut_get_object_type_name(dest_desc), dest_desc));
294 "Target is not a Reference or Constant object - %s [%p]\n",
295 acpi_ut_get_object_type_name(dest_desc),
296 dest_desc));
297 294
298 ACPI_DUMP_STACK_ENTRY(source_desc); 295 ACPI_DUMP_STACK_ENTRY(source_desc);
299 ACPI_DUMP_STACK_ENTRY(dest_desc); 296 ACPI_DUMP_STACK_ENTRY(dest_desc);
@@ -360,7 +357,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
360 357
361 default: 358 default:
362 359
363 ACPI_REPORT_ERROR(("ex_store: Unknown Reference opcode %X\n", 360 ACPI_REPORT_ERROR(("Unknown Reference opcode %X\n",
364 ref_desc->reference.opcode)); 361 ref_desc->reference.opcode));
365 ACPI_DUMP_ENTRY(ref_desc, ACPI_LV_ERROR); 362 ACPI_DUMP_ENTRY(ref_desc, ACPI_LV_ERROR);
366 363
@@ -490,10 +487,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
490 487
491 /* All other types are invalid */ 488 /* All other types are invalid */
492 489
493 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 490 ACPI_REPORT_ERROR(("Source must be Integer/Buffer/String type, not %s\n", acpi_ut_get_object_type_name(source_desc)));
494 "Source must be Integer/Buffer/String type, not %s\n",
495 acpi_ut_get_object_type_name
496 (source_desc)));
497 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 491 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
498 } 492 }
499 493
@@ -503,8 +497,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
503 break; 497 break;
504 498
505 default: 499 default:
506 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 500 ACPI_REPORT_ERROR(("Target is not a Package or buffer_field\n"));
507 "Target is not a Package or buffer_field\n"));
508 status = AE_AML_OPERAND_TYPE; 501 status = AE_AML_OPERAND_TYPE;
509 break; 502 break;
510 } 503 }
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 382f63c14ea1..25bbc1d78547 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -7,7 +7,7 @@
7 *****************************************************************************/ 7 *****************************************************************************/
8 8
9/* 9/*
10 * Copyright (C) 2000 - 2005, R. Byron Moore 10 * Copyright (C) 2000 - 2006, R. Byron Moore
11 * All rights reserved. 11 * All rights reserved.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
@@ -123,11 +123,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
123 && (source_desc->reference.opcode == AML_LOAD_OP))) { 123 && (source_desc->reference.opcode == AML_LOAD_OP))) {
124 /* Conversion successful but still not a valid type */ 124 /* Conversion successful but still not a valid type */
125 125
126 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 126 ACPI_REPORT_ERROR(("Cannot assign type %s to %s (must be type Int/Str/Buf)\n", acpi_ut_get_object_type_name(source_desc), acpi_ut_get_type_name(target_type)));
127 "Cannot assign type %s to %s (must be type Int/Str/Buf)\n",
128 acpi_ut_get_object_type_name
129 (source_desc),
130 acpi_ut_get_type_name(target_type)));
131 status = AE_AML_OPERAND_TYPE; 127 status = AE_AML_OPERAND_TYPE;
132 } 128 }
133 break; 129 break;
@@ -280,9 +276,8 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
280 /* 276 /*
281 * All other types come here. 277 * All other types come here.
282 */ 278 */
283 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 279 ACPI_REPORT_WARNING(("Store into type %s not implemented\n",
284 "Store into type %s not implemented\n", 280 acpi_ut_get_object_type_name(dest_desc)));
285 acpi_ut_get_object_type_name(dest_desc)));
286 281
287 status = AE_NOT_IMPLEMENTED; 282 status = AE_NOT_IMPLEMENTED;
288 break; 283 break;
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index 855db7130751..6ab707087750 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index 8a88b841237d..9a3684d3cf87 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -129,7 +129,7 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
129 * (ACPI specifies 100 usec as max, but this gives some slack in 129 * (ACPI specifies 100 usec as max, but this gives some slack in
130 * order to support existing BIOSs) 130 * order to support existing BIOSs)
131 */ 131 */
132 ACPI_REPORT_ERROR(("Stall: Time parameter is too large (%d)\n", 132 ACPI_REPORT_ERROR(("Time parameter is too large (%d)\n",
133 how_long)); 133 how_long));
134 status = AE_AML_OPERAND_VALUE; 134 status = AE_AML_OPERAND_VALUE;
135 } else { 135 } else {
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 9f4e547d7734..990c40e0c041 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -200,9 +200,7 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)
200 if (ACPI_SUCCESS(status)) { 200 if (ACPI_SUCCESS(status)) {
201 locked = TRUE; 201 locked = TRUE;
202 } else { 202 } else {
203 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 203 ACPI_REPORT_ERROR(("Could not acquire Global Lock, %s\n", acpi_format_exception(status)));
204 "Could not acquire Global Lock, %s\n",
205 acpi_format_exception(status)));
206 } 204 }
207 } 205 }
208 206
diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index 20a335cc9bea..5c068cc4f674 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -68,8 +68,7 @@ acpi_status acpi_hw_initialize(void)
68 /* We must have the ACPI tables by the time we get here */ 68 /* We must have the ACPI tables by the time we get here */
69 69
70 if (!acpi_gbl_FADT) { 70 if (!acpi_gbl_FADT) {
71 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No FADT is present\n")); 71 ACPI_REPORT_ERROR(("No FADT is present\n"));
72
73 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 72 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
74 } 73 }
75 74
@@ -108,7 +107,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
108 * system does not support mode transition. 107 * system does not support mode transition.
109 */ 108 */
110 if (!acpi_gbl_FADT->smi_cmd) { 109 if (!acpi_gbl_FADT->smi_cmd) {
111 ACPI_REPORT_ERROR(("No SMI_CMD in FADT, mode transition failed.\n")); 110 ACPI_REPORT_ERROR(("No SMI_CMD in FADT, mode transition failed\n"));
112 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); 111 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
113 } 112 }
114 113
diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c
index 5c8e5dfd024e..d84942d22dd5 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/hardware/hwgpe.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index b243f20708b7..b4b50a3d1705 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -7,7 +7,7 @@
7 ******************************************************************************/ 7 ******************************************************************************/
8 8
9/* 9/*
10 * Copyright (C) 2000 - 2005, R. Byron Moore 10 * Copyright (C) 2000 - 2006, R. Byron Moore
11 * All rights reserved. 11 * All rights reserved.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
@@ -202,12 +202,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
202 } 202 }
203 203
204 if (ACPI_FAILURE(status)) { 204 if (ACPI_FAILURE(status)) {
205 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 205 ACPI_REPORT_ERROR(("%s While evaluating sleep_state [%s], bad Sleep object %p type %s\n", acpi_format_exception(status), sleep_state_name, info.return_object, acpi_ut_get_object_type_name(info.return_object)));
206 "%s While evaluating sleep_state [%s], bad Sleep object %p type %s\n",
207 acpi_format_exception(status),
208 sleep_state_name, info.return_object,
209 acpi_ut_get_object_type_name(info.
210 return_object)));
211 } 206 }
212 207
213 acpi_ut_remove_reference(info.return_object); 208 acpi_ut_remove_reference(info.return_object);
@@ -230,12 +225,11 @@ EXPORT_SYMBOL(acpi_get_sleep_type_data);
230 225
231struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id) 226struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
232{ 227{
233 ACPI_FUNCTION_NAME("hw_get_bit_register_info"); 228 ACPI_FUNCTION_ENTRY();
234 229
235 if (register_id > ACPI_BITREG_MAX) { 230 if (register_id > ACPI_BITREG_MAX) {
236 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 231 ACPI_REPORT_ERROR(("Invalid bit_register ID: %X\n",
237 "Invalid bit_register ID: %X\n", 232 register_id));
238 register_id));
239 return (NULL); 233 return (NULL);
240 } 234 }
241 235
@@ -570,8 +564,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
570 break; 564 break;
571 565
572 default: 566 default:
573 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown Register ID: %X\n", 567 ACPI_REPORT_ERROR(("Unknown Register ID: %X\n", register_id));
574 register_id));
575 status = AE_BAD_PARAMETER; 568 status = AE_BAD_PARAMETER;
576 break; 569 break;
577 } 570 }
@@ -766,9 +759,8 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
766 break; 759 break;
767 760
768 default: 761 default:
769 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 762 ACPI_REPORT_ERROR(("Unsupported address space: %X\n",
770 "Unsupported address space: %X\n", 763 reg->address_space_id));
771 reg->address_space_id));
772 return (AE_BAD_PARAMETER); 764 return (AE_BAD_PARAMETER);
773 } 765 }
774 766
@@ -837,9 +829,8 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
837 break; 829 break;
838 830
839 default: 831 default:
840 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 832 ACPI_REPORT_ERROR(("Unsupported address space: %X\n",
841 "Unsupported address space: %X\n", 833 reg->address_space_id));
842 reg->address_space_id));
843 return (AE_BAD_PARAMETER); 834 return (AE_BAD_PARAMETER);
844 } 835 }
845 836
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 34519069050c..992128d71117 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c
index aff6dc141784..fc10b7cb456f 100644
--- a/drivers/acpi/hardware/hwtimer.c
+++ b/drivers/acpi/hardware/hwtimer.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index 6923059ba3c7..c2db93e25b78 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.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
@@ -110,10 +110,7 @@ acpi_status acpi_ns_root_initialize(void)
110 ACPI_NS_NO_UPSEARCH, NULL, &new_node); 110 ACPI_NS_NO_UPSEARCH, NULL, &new_node);
111 111
112 if (ACPI_FAILURE(status) || (!new_node)) { /* Must be on same line for code converter */ 112 if (ACPI_FAILURE(status) || (!new_node)) { /* Must be on same line for code converter */
113 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 113 ACPI_REPORT_ERROR(("Could not create predefined name %s, %s\n", init_val->name, acpi_format_exception(status)));
114 "Could not create predefined name %s, %s\n",
115 init_val->name,
116 acpi_format_exception(status)));
117 } 114 }
118 115
119 /* 116 /*
@@ -124,9 +121,7 @@ acpi_status acpi_ns_root_initialize(void)
124 if (init_val->val) { 121 if (init_val->val) {
125 status = acpi_os_predefined_override(init_val, &val); 122 status = acpi_os_predefined_override(init_val, &val);
126 if (ACPI_FAILURE(status)) { 123 if (ACPI_FAILURE(status)) {
127 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 124 ACPI_REPORT_ERROR(("Could not override predefined %s\n", init_val->name));
128 "Could not override predefined %s\n",
129 init_val->name));
130 } 125 }
131 126
132 if (!val) { 127 if (!val) {
@@ -339,7 +334,10 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
339 prefix_node = scope_info->scope.node; 334 prefix_node = scope_info->scope.node;
340 if (ACPI_GET_DESCRIPTOR_TYPE(prefix_node) != 335 if (ACPI_GET_DESCRIPTOR_TYPE(prefix_node) !=
341 ACPI_DESC_TYPE_NAMED) { 336 ACPI_DESC_TYPE_NAMED) {
342 ACPI_REPORT_ERROR(("ns_lookup: %p is not a namespace node [%s]\n", prefix_node, acpi_ut_get_descriptor_name(prefix_node))); 337 ACPI_REPORT_ERROR(("%p is not a namespace node [%s]\n",
338 prefix_node,
339 acpi_ut_get_descriptor_name
340 (prefix_node)));
343 return_ACPI_STATUS(AE_AML_INTERNAL); 341 return_ACPI_STATUS(AE_AML_INTERNAL);
344 } 342 }
345 343
@@ -600,7 +598,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
600 (this_node->type != type_to_check_for)) { 598 (this_node->type != type_to_check_for)) {
601 /* Complain about a type mismatch */ 599 /* Complain about a type mismatch */
602 600
603 ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", (char *)&simple_name, acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for))); 601 ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", ACPI_CAST_PTR(char, &simple_name), acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for)));
604 } 602 }
605 603
606 /* 604 /*
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index cc7a85f8cfe6..3db950f5d5a0 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.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
@@ -272,9 +272,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
272 /* Grandchildren should have all been deleted already */ 272 /* Grandchildren should have all been deleted already */
273 273
274 if (child_node->child) { 274 if (child_node->child) {
275 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 275 ACPI_REPORT_ERROR(("Found a grandchild! P=%p C=%p\n",
276 "Found a grandchild! P=%p C=%p\n", 276 parent_node, child_node));
277 parent_node, child_node));
278 } 277 }
279 278
280 /* Now we can free this child object */ 279 /* Now we can free this child object */
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 864c642759fa..2f0b70e3e881 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.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
@@ -198,7 +198,8 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
198 /* Check the node type and name */ 198 /* Check the node type and name */
199 199
200 if (type > ACPI_TYPE_LOCAL_MAX) { 200 if (type > ACPI_TYPE_LOCAL_MAX) {
201 ACPI_REPORT_WARNING(("Invalid ACPI Type %08X\n", type)); 201 ACPI_REPORT_WARNING(("Invalid ACPI Object Type %08X\n",
202 type));
202 } 203 }
203 204
204 if (!acpi_ut_valid_acpi_name(this_node->name.integer)) { 205 if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index 55de883943d6..aff899a935e3 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.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
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 0191c7d92824..e3c667072e2f 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -6,7 +6,7 @@
6 ******************************************************************************/ 6 ******************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -373,8 +373,7 @@ acpi_ns_execute_control_method(struct acpi_parameter_info *info)
373 373
374 info->obj_desc = acpi_ns_get_attached_object(info->node); 374 info->obj_desc = acpi_ns_get_attached_object(info->node);
375 if (!info->obj_desc) { 375 if (!info->obj_desc) {
376 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 376 ACPI_REPORT_ERROR(("No attached method object\n"));
377 "No attached method object\n"));
378 377
379 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); 378 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
380 return_ACPI_STATUS(AE_NULL_OBJECT); 379 return_ACPI_STATUS(AE_NULL_OBJECT);
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index efa3f4233736..6c117893f301 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.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
@@ -93,8 +93,8 @@ acpi_status acpi_ns_initialize_objects(void)
93 ACPI_UINT32_MAX, acpi_ns_init_one_object, 93 ACPI_UINT32_MAX, acpi_ns_init_one_object,
94 &info, NULL); 94 &info, NULL);
95 if (ACPI_FAILURE(status)) { 95 if (ACPI_FAILURE(status)) {
96 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n", 96 ACPI_REPORT_ERROR(("walk_namespace failed! %s\n",
97 acpi_format_exception(status))); 97 acpi_format_exception(status)));
98 } 98 }
99 99
100 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 100 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -159,8 +159,8 @@ acpi_status acpi_ns_initialize_devices(void)
159 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); 159 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
160 160
161 if (ACPI_FAILURE(status)) { 161 if (ACPI_FAILURE(status)) {
162 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n", 162 ACPI_REPORT_ERROR(("walk_namespace failed! %s\n",
163 acpi_format_exception(status))); 163 acpi_format_exception(status)));
164 } 164 }
165 165
166 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 166 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -289,12 +289,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
289 } 289 }
290 290
291 if (ACPI_FAILURE(status)) { 291 if (ACPI_FAILURE(status)) {
292 ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR, "\n")); 292 ACPI_REPORT_ERROR(("\nCould not execute arguments for [%4.4s] (%s), %s\n", acpi_ut_get_node_name(node), acpi_ut_get_type_name(type), acpi_format_exception(status)));
293 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
294 "Could not execute arguments for [%4.4s] (%s), %s\n",
295 acpi_ut_get_node_name(node),
296 acpi_ut_get_type_name(type),
297 acpi_format_exception(status)));
298 } 293 }
299 294
300 /* 295 /*
@@ -421,8 +416,9 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
421#ifdef ACPI_DEBUG_OUTPUT 416#ifdef ACPI_DEBUG_OUTPUT
422 char *scope_name = acpi_ns_get_external_pathname(ini_node); 417 char *scope_name = acpi_ns_get_external_pathname(ini_node);
423 418
424 ACPI_DEBUG_PRINT((ACPI_DB_WARN, "%s._INI failed: %s\n", 419 ACPI_REPORT_WARNING(("%s._INI failed: %s\n",
425 scope_name, acpi_format_exception(status))); 420 scope_name,
421 acpi_format_exception(status)));
426 422
427 ACPI_MEM_FREE(scope_name); 423 ACPI_MEM_FREE(scope_name);
428#endif 424#endif
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index c28849de465a..0b4a866ef5aa 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.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
@@ -92,7 +92,7 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
92 /* Check validity of the AML start and length */ 92 /* Check validity of the AML start and length */
93 93
94 if (!table_desc->aml_start) { 94 if (!table_desc->aml_start) {
95 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null AML pointer\n")); 95 ACPI_REPORT_ERROR(("Null AML pointer\n"));
96 return_ACPI_STATUS(AE_BAD_PARAMETER); 96 return_ACPI_STATUS(AE_BAD_PARAMETER);
97 } 97 }
98 98
@@ -263,7 +263,7 @@ acpi_status acpi_ns_load_namespace(void)
263 /* There must be at least a DSDT installed */ 263 /* There must be at least a DSDT installed */
264 264
265 if (acpi_gbl_DSDT == NULL) { 265 if (acpi_gbl_DSDT == NULL) {
266 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "DSDT is not in memory\n")); 266 ACPI_REPORT_ERROR(("DSDT is not in memory\n"));
267 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 267 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
268 } 268 }
269 269
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index 5400728eb791..411e1f8b11d0 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.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
@@ -75,7 +75,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
75 acpi_size index; 75 acpi_size index;
76 struct acpi_namespace_node *parent_node; 76 struct acpi_namespace_node *parent_node;
77 77
78 ACPI_FUNCTION_NAME("ns_build_external_path"); 78 ACPI_FUNCTION_ENTRY();
79 79
80 /* Special case for root */ 80 /* Special case for root */
81 81
@@ -110,9 +110,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
110 name_buffer[index] = AML_ROOT_PREFIX; 110 name_buffer[index] = AML_ROOT_PREFIX;
111 111
112 if (index != 0) { 112 if (index != 0) {
113 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 113 ACPI_REPORT_ERROR(("Could not construct pathname; index=%X, size=%X, Path=%s\n", (u32) index, (u32) size, &name_buffer[size]));
114 "Could not construct pathname; index=%X, size=%X, Path=%s\n",
115 (u32) index, (u32) size, &name_buffer[size]));
116 } 114 }
117 115
118 return; 116 return;
@@ -148,7 +146,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
148 146
149 name_buffer = ACPI_MEM_CALLOCATE(size); 147 name_buffer = ACPI_MEM_CALLOCATE(size);
150 if (!name_buffer) { 148 if (!name_buffer) {
151 ACPI_REPORT_ERROR(("ns_get_table_pathname: allocation failure\n")); 149 ACPI_REPORT_ERROR(("Allocation failure\n"));
152 return_PTR(NULL); 150 return_PTR(NULL);
153 } 151 }
154 152
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index fc9be946ebed..86113093f7b7 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -6,7 +6,7 @@
6 ******************************************************************************/ 6 ******************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -84,21 +84,21 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
84 if (!node) { 84 if (!node) {
85 /* Invalid handle */ 85 /* Invalid handle */
86 86
87 ACPI_REPORT_ERROR(("ns_attach_object: Null named_obj handle\n")); 87 ACPI_REPORT_ERROR(("Null named_obj handle\n"));
88 return_ACPI_STATUS(AE_BAD_PARAMETER); 88 return_ACPI_STATUS(AE_BAD_PARAMETER);
89 } 89 }
90 90
91 if (!object && (ACPI_TYPE_ANY != type)) { 91 if (!object && (ACPI_TYPE_ANY != type)) {
92 /* Null object */ 92 /* Null object */
93 93
94 ACPI_REPORT_ERROR(("ns_attach_object: Null object, but type not ACPI_TYPE_ANY\n")); 94 ACPI_REPORT_ERROR(("Null object, but type not ACPI_TYPE_ANY\n"));
95 return_ACPI_STATUS(AE_BAD_PARAMETER); 95 return_ACPI_STATUS(AE_BAD_PARAMETER);
96 } 96 }
97 97
98 if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) { 98 if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {
99 /* Not a name handle */ 99 /* Not a name handle */
100 100
101 ACPI_REPORT_ERROR(("ns_attach_object: Invalid handle %p [%s]\n", 101 ACPI_REPORT_ERROR(("Invalid handle %p [%s]\n",
102 node, acpi_ut_get_descriptor_name(node))); 102 node, acpi_ut_get_descriptor_name(node)));
103 return_ACPI_STATUS(AE_BAD_PARAMETER); 103 return_ACPI_STATUS(AE_BAD_PARAMETER);
104 } 104 }
@@ -254,7 +254,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
254 ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node); 254 ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node);
255 255
256 if (!node) { 256 if (!node) {
257 ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Null Node ptr\n")); 257 ACPI_REPORT_WARNING(("Null Node ptr\n"));
258 return_PTR(NULL); 258 return_PTR(NULL);
259 } 259 }
260 260
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 433442a9ec74..232be4303653 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.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
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index c1b1943d4670..f094a2eb8512 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.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
@@ -298,18 +298,15 @@ acpi_ns_search_and_enter(u32 target_name,
298 /* Parameter validation */ 298 /* Parameter validation */
299 299
300 if (!node || !target_name || !return_node) { 300 if (!node || !target_name || !return_node) {
301 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 301 ACPI_REPORT_ERROR(("Null param: Node %p Name %X return_node %p\n", node, target_name, return_node));
302 "Null param: Node %p Name %X return_node %p\n",
303 node, target_name, return_node));
304
305 ACPI_REPORT_ERROR(("ns_search_and_enter: Null parameter\n"));
306 return_ACPI_STATUS(AE_BAD_PARAMETER); 302 return_ACPI_STATUS(AE_BAD_PARAMETER);
307 } 303 }
308 304
309 /* Name must consist of printable characters */ 305 /* Name must consist of printable characters */
310 306
311 if (!acpi_ut_valid_acpi_name(target_name)) { 307 if (!acpi_ut_valid_acpi_name(target_name)) {
312 ACPI_REPORT_ERROR(("ns_search_and_enter: Bad character in ACPI Name: %X\n", target_name)); 308 ACPI_REPORT_ERROR(("Bad character in ACPI Name: %X\n",
309 target_name));
313 return_ACPI_STATUS(AE_BAD_CHARACTER); 310 return_ACPI_STATUS(AE_BAD_CHARACTER);
314 } 311 }
315 312
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index 549075fb9f88..bc779fdd3caf 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,6 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
63 * 63 *
64 * PARAMETERS: module_name - Caller's module name (for error output) 64 * PARAMETERS: module_name - Caller's module name (for error output)
65 * line_number - Caller's line number (for error output) 65 * line_number - Caller's line number (for error output)
66 * component_id - Caller's component ID (for error output)
67 * internal_name - Name or path of the namespace node 66 * internal_name - Name or path of the namespace node
68 * lookup_status - Exception code from NS lookup 67 * lookup_status - Exception code from NS lookup
69 * 68 *
@@ -76,14 +75,12 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
76void 75void
77acpi_ns_report_error(char *module_name, 76acpi_ns_report_error(char *module_name,
78 u32 line_number, 77 u32 line_number,
79 u32 component_id,
80 char *internal_name, acpi_status lookup_status) 78 char *internal_name, acpi_status lookup_status)
81{ 79{
82 acpi_status status; 80 acpi_status status;
83 char *name = NULL; 81 char *name = NULL;
84 82
85 acpi_os_printf("%8s-%04d: *** Error: Looking up ", 83 acpi_ut_report_error(module_name, line_number);
86 module_name, line_number);
87 84
88 if (lookup_status == AE_BAD_CHARACTER) { 85 if (lookup_status == AE_BAD_CHARACTER) {
89 /* There is a non-ascii character in the name */ 86 /* There is a non-ascii character in the name */
@@ -109,7 +106,7 @@ acpi_ns_report_error(char *module_name,
109 } 106 }
110 } 107 }
111 108
112 acpi_os_printf(" in namespace, %s\n", 109 acpi_os_printf("Namespace lookup failure, %s\n",
113 acpi_format_exception(lookup_status)); 110 acpi_format_exception(lookup_status));
114} 111}
115 112
@@ -119,10 +116,9 @@ acpi_ns_report_error(char *module_name,
119 * 116 *
120 * PARAMETERS: module_name - Caller's module name (for error output) 117 * PARAMETERS: module_name - Caller's module name (for error output)
121 * line_number - Caller's line number (for error output) 118 * line_number - Caller's line number (for error output)
122 * component_id - Caller's component ID (for error output)
123 * Message - Error message to use on failure 119 * Message - Error message to use on failure
124 * prefix_node - Prefix relative to the path 120 * prefix_node - Prefix relative to the path
125 * Path - Path to the node 121 * Path - Path to the node (optional)
126 * method_status - Execution status 122 * method_status - Execution status
127 * 123 *
128 * RETURN: None 124 * RETURN: None
@@ -134,7 +130,6 @@ acpi_ns_report_error(char *module_name,
134void 130void
135acpi_ns_report_method_error(char *module_name, 131acpi_ns_report_method_error(char *module_name,
136 u32 line_number, 132 u32 line_number,
137 u32 component_id,
138 char *message, 133 char *message,
139 struct acpi_namespace_node *prefix_node, 134 struct acpi_namespace_node *prefix_node,
140 char *path, acpi_status method_status) 135 char *path, acpi_status method_status)
@@ -142,17 +137,16 @@ acpi_ns_report_method_error(char *module_name,
142 acpi_status status; 137 acpi_status status;
143 struct acpi_namespace_node *node = prefix_node; 138 struct acpi_namespace_node *node = prefix_node;
144 139
140 acpi_ut_report_error(module_name, line_number);
141
145 if (path) { 142 if (path) {
146 status = acpi_ns_get_node_by_path(path, prefix_node, 143 status = acpi_ns_get_node_by_path(path, prefix_node,
147 ACPI_NS_NO_UPSEARCH, &node); 144 ACPI_NS_NO_UPSEARCH, &node);
148 if (ACPI_FAILURE(status)) { 145 if (ACPI_FAILURE(status)) {
149 acpi_os_printf 146 acpi_os_printf("[Could not get node by pathname]");
150 ("report_method_error: Could not get node\n");
151 return;
152 } 147 }
153 } 148 }
154 149
155 acpi_os_printf("%8s-%04d: *** Error: ", module_name, line_number);
156 acpi_ns_print_node_pathname(node, message); 150 acpi_ns_print_node_pathname(node, message);
157 acpi_os_printf(", %s\n", acpi_format_exception(method_status)); 151 acpi_os_printf(", %s\n", acpi_format_exception(method_status));
158} 152}
@@ -248,7 +242,7 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
248 ACPI_FUNCTION_TRACE("ns_get_type"); 242 ACPI_FUNCTION_TRACE("ns_get_type");
249 243
250 if (!node) { 244 if (!node) {
251 ACPI_REPORT_WARNING(("ns_get_type: Null Node input pointer\n")); 245 ACPI_REPORT_WARNING(("Null Node parameter\n"));
252 return_UINT32(ACPI_TYPE_ANY); 246 return_UINT32(ACPI_TYPE_ANY);
253 } 247 }
254 248
@@ -275,7 +269,7 @@ u32 acpi_ns_local(acpi_object_type type)
275 if (!acpi_ut_valid_object_type(type)) { 269 if (!acpi_ut_valid_object_type(type)) {
276 /* Type code out of range */ 270 /* Type code out of range */
277 271
278 ACPI_REPORT_WARNING(("ns_local: Invalid Object Type\n")); 272 ACPI_REPORT_WARNING(("Invalid Object Type %X\n", type));
279 return_UINT32(ACPI_NS_NORMAL); 273 return_UINT32(ACPI_NS_NORMAL);
280 } 274 }
281 275
@@ -627,7 +621,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
627 * with internal_name (invalid format). 621 * with internal_name (invalid format).
628 */ 622 */
629 if (required_length > internal_name_length) { 623 if (required_length > internal_name_length) {
630 ACPI_REPORT_ERROR(("ns_externalize_name: Invalid internal name\n")); 624 ACPI_REPORT_ERROR(("Invalid internal name\n"));
631 return_ACPI_STATUS(AE_BAD_PATHNAME); 625 return_ACPI_STATUS(AE_BAD_PATHNAME);
632 } 626 }
633 627
@@ -803,8 +797,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
803 if (!acpi_ut_valid_object_type(type)) { 797 if (!acpi_ut_valid_object_type(type)) {
804 /* type code out of range */ 798 /* type code out of range */
805 799
806 ACPI_REPORT_WARNING(("ns_opens_scope: Invalid Object Type %X\n", 800 ACPI_REPORT_WARNING(("Invalid Object Type %X\n", type));
807 type));
808 return_UINT32(ACPI_NS_NORMAL); 801 return_UINT32(ACPI_NS_NORMAL);
809 } 802 }
810 803
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 5f164c0df33b..fcab1e784b81 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.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
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 75b137a6a3c9..de13add43efc 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -6,7 +6,7 @@
6 ******************************************************************************/ 6 ******************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -112,8 +112,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
112 if (return_buffer->length == 0) { 112 if (return_buffer->length == 0) {
113 /* Error because caller specifically asked for a return value */ 113 /* Error because caller specifically asked for a return value */
114 114
115 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No return value\n")); 115 ACPI_REPORT_ERROR(("No return value\n"));
116
117 return_ACPI_STATUS(AE_NULL_OBJECT); 116 return_ACPI_STATUS(AE_NULL_OBJECT);
118 } 117 }
119 118
@@ -125,11 +124,11 @@ acpi_evaluate_object_typed(acpi_handle handle,
125 124
126 /* Return object type does not match requested type */ 125 /* Return object type does not match requested type */
127 126
128 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 127 ACPI_REPORT_ERROR(("Incorrect return type [%s] requested [%s]\n",
129 "Incorrect return type [%s] requested [%s]\n", 128 acpi_ut_get_type_name(((union acpi_object *)
130 acpi_ut_get_type_name(((union acpi_object *) 129 return_buffer->pointer)->
131 return_buffer->pointer)->type), 130 type),
132 acpi_ut_get_type_name(return_type))); 131 acpi_ut_get_type_name(return_type)));
133 132
134 if (must_free) { 133 if (must_free) {
135 /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */ 134 /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
@@ -236,11 +235,9 @@ acpi_evaluate_object(acpi_handle handle,
236 * qualified names above, this is an error 235 * qualified names above, this is an error
237 */ 236 */
238 if (!pathname) { 237 if (!pathname) {
239 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 238 ACPI_REPORT_ERROR(("Both Handle and Pathname are NULL\n"));
240 "Both Handle and Pathname are NULL\n"));
241 } else { 239 } else {
242 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 240 ACPI_REPORT_ERROR(("Handle is NULL and Pathname is relative\n"));
243 "Handle is NULL and Pathname is relative\n"));
244 } 241 }
245 242
246 status = AE_BAD_PARAMETER; 243 status = AE_BAD_PARAMETER;
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c
index 6b5f8d4481d1..853e6d170c96 100644
--- a/drivers/acpi/namespace/nsxfname.c
+++ b/drivers/acpi/namespace/nsxfname.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c
index 0856d42e6909..a0332595677a 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/namespace/nsxfobj.c
@@ -6,7 +6,7 @@
6 ******************************************************************************/ 6 ******************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
index e6d4cb9fd303..3c37cd0ecd80 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.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
@@ -298,7 +298,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
298 acpi_ps_append_arg(arg, name_op); 298 acpi_ps_append_arg(arg, name_op);
299 299
300 if (!method_desc) { 300 if (!method_desc) {
301 ACPI_REPORT_ERROR(("ps_get_next_namepath: Control Method %p has no attached object\n", node)); 301 ACPI_REPORT_ERROR(("Control Method %p has no attached object\n", node));
302 return_ACPI_STATUS(AE_AML_INTERNAL); 302 return_ACPI_STATUS(AE_AML_INTERNAL);
303 } 303 }
304 304
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
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 229ae86afe8b..11d6351ab8b2 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.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
@@ -747,7 +747,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
747 747
748 /* Unknown AML opcode */ 748 /* Unknown AML opcode */
749 749
750 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 750 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
751 "Unknown AML opcode [%4.4X]\n", opcode)); 751 "Unknown AML opcode [%4.4X]\n", opcode));
752 752
753 return (&acpi_gbl_aml_op_info[_UNK]); 753 return (&acpi_gbl_aml_op_info[_UNK]);
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index f0979b2956f2..3b540fe17a0c 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.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
@@ -512,9 +512,9 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
512 } else if ((status != AE_OK) && (walk_state->method_desc)) { 512 } else if ((status != AE_OK) && (walk_state->method_desc)) {
513 /* Either the method parse or actual execution failed */ 513 /* Either the method parse or actual execution failed */
514 514
515 ACPI_REPORT_METHOD_ERROR 515 ACPI_REPORT_MTERROR("Method parse/execution failed",
516 ("Method parse/execution failed", 516 walk_state->method_node, NULL,
517 walk_state->method_node, NULL, status); 517 status);
518 518
519 /* Check for possible multi-thread reentrancy problem */ 519 /* Check for possible multi-thread reentrancy problem */
520 520
diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c
index 1c953b6f1af1..bc6047caccd9 100644
--- a/drivers/acpi/parser/psscope.c
+++ b/drivers/acpi/parser/psscope.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
diff --git a/drivers/acpi/parser/pstree.c b/drivers/acpi/parser/pstree.c
index f0e755884eea..d387e2b01dbb 100644
--- a/drivers/acpi/parser/pstree.c
+++ b/drivers/acpi/parser/pstree.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
@@ -132,7 +132,8 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
132 if (op_info->class == AML_CLASS_UNKNOWN) { 132 if (op_info->class == AML_CLASS_UNKNOWN) {
133 /* Invalid opcode */ 133 /* Invalid opcode */
134 134
135 ACPI_REPORT_ERROR(("ps_append_arg: Invalid AML Opcode: 0x%2.2X\n", op->common.aml_opcode)); 135 ACPI_REPORT_ERROR(("Invalid AML Opcode: 0x%2.2X\n",
136 op->common.aml_opcode));
136 return; 137 return;
137 } 138 }
138 139
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c
index 2075efbb4324..3e07cb9cb748 100644
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/parser/psutils.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
diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c
index 08f2321b6ded..06f05bfd7612 100644
--- a/drivers/acpi/parser/pswalk.c
+++ b/drivers/acpi/parser/pswalk.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
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index 14d544d60867..2dd48cbb7c02 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.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
diff --git a/drivers/acpi/resources/rsaddr.c b/drivers/acpi/resources/rsaddr.c
index 4ac942badbc0..8fa3213ce000 100644
--- a/drivers/acpi/resources/rsaddr.c
+++ b/drivers/acpi/resources/rsaddr.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
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index c2c4d9079c6c..1dfa6906d455 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.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
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 6c7c6c560635..7f46ca0bf33a 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.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
@@ -207,21 +207,14 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
207 /* Each element of the top-level package must also be a package */ 207 /* Each element of the top-level package must also be a package */
208 208
209 if (ACPI_GET_OBJECT_TYPE(*top_object_list) != ACPI_TYPE_PACKAGE) { 209 if (ACPI_GET_OBJECT_TYPE(*top_object_list) != ACPI_TYPE_PACKAGE) {
210 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 210 ACPI_REPORT_ERROR(("(PRT[%X]) Need sub-package, found %s\n", index, acpi_ut_get_object_type_name(*top_object_list)));
211 "(PRT[%X]) Need sub-package, found %s\n",
212 index,
213 acpi_ut_get_object_type_name
214 (*top_object_list)));
215 return_ACPI_STATUS(AE_AML_OPERAND_TYPE); 211 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
216 } 212 }
217 213
218 /* Each sub-package must be of length 4 */ 214 /* Each sub-package must be of length 4 */
219 215
220 if ((*top_object_list)->package.count != 4) { 216 if ((*top_object_list)->package.count != 4) {
221 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 217 ACPI_REPORT_ERROR(("(PRT[%X]) Need package of length 4, found length %d\n", index, (*top_object_list)->package.count));
222 "(PRT[%X]) Need package of length 4, found length %d\n",
223 index,
224 (*top_object_list)->package.count));
225 return_ACPI_STATUS(AE_AML_PACKAGE_LIMIT); 218 return_ACPI_STATUS(AE_AML_PACKAGE_LIMIT);
226 } 219 }
227 220
@@ -238,11 +231,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
238 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) { 231 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
239 user_prt->address = obj_desc->integer.value; 232 user_prt->address = obj_desc->integer.value;
240 } else { 233 } else {
241 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 234 ACPI_REPORT_ERROR(("(PRT[%X].Address) Need Integer, found %s\n", index, acpi_ut_get_object_type_name(obj_desc)));
242 "(PRT[%X].Address) Need Integer, found %s\n",
243 index,
244 acpi_ut_get_object_type_name
245 (obj_desc)));
246 return_ACPI_STATUS(AE_BAD_DATA); 235 return_ACPI_STATUS(AE_BAD_DATA);
247 } 236 }
248 237
@@ -252,11 +241,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
252 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) { 241 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
253 user_prt->pin = (u32) obj_desc->integer.value; 242 user_prt->pin = (u32) obj_desc->integer.value;
254 } else { 243 } else {
255 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 244 ACPI_REPORT_ERROR(("(PRT[%X].Pin) Need Integer, found %s\n", index, acpi_ut_get_object_type_name(obj_desc)));
256 "(PRT[%X].Pin) Need Integer, found %s\n",
257 index,
258 acpi_ut_get_object_type_name
259 (obj_desc)));
260 return_ACPI_STATUS(AE_BAD_DATA); 245 return_ACPI_STATUS(AE_BAD_DATA);
261 } 246 }
262 247
@@ -267,10 +252,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
267 case ACPI_TYPE_LOCAL_REFERENCE: 252 case ACPI_TYPE_LOCAL_REFERENCE:
268 253
269 if (obj_desc->reference.opcode != AML_INT_NAMEPATH_OP) { 254 if (obj_desc->reference.opcode != AML_INT_NAMEPATH_OP) {
270 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 255 ACPI_REPORT_ERROR(("(PRT[%X].Source) Need name, found reference op %X\n", index, obj_desc->reference.opcode));
271 "(PRT[%X].Source) Need name, found reference op %X\n",
272 index,
273 obj_desc->reference.opcode));
274 return_ACPI_STATUS(AE_BAD_DATA); 256 return_ACPI_STATUS(AE_BAD_DATA);
275 } 257 }
276 258
@@ -316,11 +298,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
316 298
317 default: 299 default:
318 300
319 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 301 ACPI_REPORT_ERROR(("(PRT[%X].Source) Need Ref/String/Integer, found %s\n", index, acpi_ut_get_object_type_name(obj_desc)));
320 "(PRT[%X].Source) Need Ref/String/Integer, found %s\n",
321 index,
322 acpi_ut_get_object_type_name
323 (obj_desc)));
324 return_ACPI_STATUS(AE_BAD_DATA); 302 return_ACPI_STATUS(AE_BAD_DATA);
325 } 303 }
326 304
@@ -335,11 +313,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
335 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) { 313 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
336 user_prt->source_index = (u32) obj_desc->integer.value; 314 user_prt->source_index = (u32) obj_desc->integer.value;
337 } else { 315 } else {
338 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 316 ACPI_REPORT_ERROR(("(PRT[%X].source_index) Need Integer, found %s\n", index, acpi_ut_get_object_type_name(obj_desc)));
339 "(PRT[%X].source_index) Need Integer, found %s\n",
340 index,
341 acpi_ut_get_object_type_name
342 (obj_desc)));
343 return_ACPI_STATUS(AE_BAD_DATA); 317 return_ACPI_STATUS(AE_BAD_DATA);
344 } 318 }
345 319
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index c24e3eb658c3..98356e2482c5 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.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
diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c
index 623b06689336..d9ae64b77bd9 100644
--- a/drivers/acpi/resources/rsinfo.c
+++ b/drivers/acpi/resources/rsinfo.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
diff --git a/drivers/acpi/resources/rsio.c b/drivers/acpi/resources/rsio.c
index ef24ba110c6e..ea567167c4f2 100644
--- a/drivers/acpi/resources/rsio.c
+++ b/drivers/acpi/resources/rsio.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
diff --git a/drivers/acpi/resources/rsirq.c b/drivers/acpi/resources/rsirq.c
index 79e71257b69a..1fa63bc2e36f 100644
--- a/drivers/acpi/resources/rsirq.c
+++ b/drivers/acpi/resources/rsirq.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
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c
index 573c06705641..e4778a51c17e 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.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
@@ -156,9 +156,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
156 /* Validate the (internal) Resource Type */ 156 /* Validate the (internal) Resource Type */
157 157
158 if (resource->type > ACPI_RESOURCE_TYPE_MAX) { 158 if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
159 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 159 ACPI_REPORT_ERROR(("Invalid descriptor type (%X) in resource list\n", resource->type));
160 "Invalid descriptor type (%X) in resource list\n",
161 resource->type));
162 return_ACPI_STATUS(AE_BAD_DATA); 160 return_ACPI_STATUS(AE_BAD_DATA);
163 } 161 }
164 162
diff --git a/drivers/acpi/resources/rsmemory.c b/drivers/acpi/resources/rsmemory.c
index 418a3fb64077..a5131936d690 100644
--- a/drivers/acpi/resources/rsmemory.c
+++ b/drivers/acpi/resources/rsmemory.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
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index 4a758bd4a5c8..83bfe0dd3eba 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.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
@@ -523,9 +523,7 @@ if (((aml->irq.flags & 0x09) == 0x00) || ((aml->irq.flags & 0x09) == 0x09)) {
523 * polarity/trigger interrupts are allowed (ACPI spec, section 523 * polarity/trigger interrupts are allowed (ACPI spec, section
524 * "IRQ Format"), so 0x00 and 0x09 are illegal. 524 * "IRQ Format"), so 0x00 and 0x09 are illegal.
525 */ 525 */
526 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 526 ACPI_REPORT_ERROR(("Invalid interrupt polarity/trigger in resource list, %X\n", aml->irq.flags));
527 "Invalid interrupt polarity/trigger in resource list, %X\n",
528 aml->irq.flags));
529 return_ACPI_STATUS(AE_BAD_DATA); 527 return_ACPI_STATUS(AE_BAD_DATA);
530} 528}
531 529
@@ -537,8 +535,7 @@ if (temp8 < 1) {
537} 535}
538 536
539if (resource->data.dma.transfer == 0x03) { 537if (resource->data.dma.transfer == 0x03) {
540 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 538 ACPI_REPORT_ERROR(("Invalid DMA.Transfer preference (3)\n"));
541 "Invalid DMA.Transfer preference (3)\n"));
542 return_ACPI_STATUS(AE_BAD_DATA); 539 return_ACPI_STATUS(AE_BAD_DATA);
543} 540}
544#endif 541#endif
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 2236a0c90daa..25b5aedd6612 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.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
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index 50a956b705b0..88b67077aeeb 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.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
diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
index cd33397d9231..48290b7e6ba5 100644
--- a/drivers/acpi/tables/tbconvrt.c
+++ b/drivers/acpi/tables/tbconvrt.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
diff --git a/drivers/acpi/tables/tbget.c b/drivers/acpi/tables/tbget.c
index 6acd5aeb093e..0fedf4b27ea5 100644
--- a/drivers/acpi/tables/tbget.c
+++ b/drivers/acpi/tables/tbget.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
@@ -362,8 +362,8 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
362 362
363 default: 363 default:
364 364
365 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid address flags %X\n", 365 ACPI_REPORT_ERROR(("Invalid address flags %X\n",
366 address->pointer_type)); 366 address->pointer_type));
367 return_ACPI_STATUS(AE_BAD_PARAMETER); 367 return_ACPI_STATUS(AE_BAD_PARAMETER);
368 } 368 }
369 369
diff --git a/drivers/acpi/tables/tbgetall.c b/drivers/acpi/tables/tbgetall.c
index 33c9ed8a6f99..496f336b3e3a 100644
--- a/drivers/acpi/tables/tbgetall.c
+++ b/drivers/acpi/tables/tbgetall.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
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 10db8484e462..e1c9faa3982e 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.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
diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index 3cee0cee4cc2..178309026850 100644
--- a/drivers/acpi/tables/tbrsdt.c
+++ b/drivers/acpi/tables/tbrsdt.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_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
176{ 176{
177 int no_match; 177 int no_match;
178 178
179 ACPI_FUNCTION_NAME("tb_validate_rsdt"); 179 ACPI_FUNCTION_ENTRY();
180 180
181 /* 181 /*
182 * Search for appropriate signature, RSDT or XSDT 182 * Search for appropriate signature, RSDT or XSDT
@@ -192,15 +192,11 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
192 if (no_match) { 192 if (no_match) {
193 /* Invalid RSDT or XSDT signature */ 193 /* Invalid RSDT or XSDT signature */
194 194
195 ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located\n")); 195 ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located. RSDP:\n"));
196 196
197 ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20); 197 ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);
198 198
199 ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR, 199 ACPI_REPORT_ERROR(("RSDT/XSDT signature at %X (%p) is invalid\n", acpi_gbl_RSDP->rsdt_physical_address, (void *)(acpi_native_uint) acpi_gbl_RSDP->rsdt_physical_address));
200 "RSDT/XSDT signature at %X (%p) is invalid\n",
201 acpi_gbl_RSDP->rsdt_physical_address,
202 (void *)(acpi_native_uint) acpi_gbl_RSDP->
203 rsdt_physical_address));
204 200
205 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) { 201 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
206 ACPI_REPORT_ERROR(("Looking for RSDT\n")) 202 ACPI_REPORT_ERROR(("Looking for RSDT\n"))
@@ -209,7 +205,6 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
209 } 205 }
210 206
211 ACPI_DUMP_BUFFER((char *)table_ptr, 48); 207 ACPI_DUMP_BUFFER((char *)table_ptr, 48);
212
213 return (AE_BAD_SIGNATURE); 208 return (AE_BAD_SIGNATURE);
214 } 209 }
215 210
@@ -243,9 +238,8 @@ acpi_status acpi_tb_get_table_rsdt(void)
243 table_info.type = ACPI_TABLE_XSDT; 238 table_info.type = ACPI_TABLE_XSDT;
244 status = acpi_tb_get_table(&address, &table_info); 239 status = acpi_tb_get_table(&address, &table_info);
245 if (ACPI_FAILURE(status)) { 240 if (ACPI_FAILURE(status)) {
246 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 241 ACPI_REPORT_ERROR(("Could not get the RSDT/XSDT, %s\n",
247 "Could not get the RSDT/XSDT, %s\n", 242 acpi_format_exception(status)));
248 acpi_format_exception(status)));
249 243
250 return_ACPI_STATUS(status); 244 return_ACPI_STATUS(status);
251 } 245 }
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 9d0bf536d674..38c6749e43d5 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.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
@@ -144,14 +144,13 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
144{ 144{
145 acpi_name signature; 145 acpi_name signature;
146 146
147 ACPI_FUNCTION_NAME("tb_validate_table_header"); 147 ACPI_FUNCTION_ENTRY();
148 148
149 /* Verify that this is a valid address */ 149 /* Verify that this is a valid address */
150 150
151 if (!acpi_os_readable(table_header, sizeof(struct acpi_table_header))) { 151 if (!acpi_os_readable(table_header, sizeof(struct acpi_table_header))) {
152 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 152 ACPI_REPORT_ERROR(("Cannot read table header at %p\n",
153 "Cannot read table header at %p\n", 153 table_header));
154 table_header));
155 154
156 return (AE_BAD_ADDRESS); 155 return (AE_BAD_ADDRESS);
157 } 156 }
@@ -160,12 +159,10 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
160 159
161 ACPI_MOVE_32_TO_32(&signature, table_header->signature); 160 ACPI_MOVE_32_TO_32(&signature, table_header->signature);
162 if (!acpi_ut_valid_acpi_name(signature)) { 161 if (!acpi_ut_valid_acpi_name(signature)) {
163 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 162 ACPI_REPORT_ERROR(("Table signature at %p [%p] has invalid characters\n", table_header, &signature));
164 "Table signature at %p [%p] has invalid characters\n",
165 table_header, &signature));
166 163
167 ACPI_REPORT_WARNING(("Invalid table signature found: [%4.4s]\n", 164 ACPI_REPORT_WARNING(("Invalid table signature found: [%4.4s]\n",
168 (char *)&signature)); 165 ACPI_CAST_PTR(char, &signature)));
169 166
170 ACPI_DUMP_BUFFER(table_header, 167 ACPI_DUMP_BUFFER(table_header,
171 sizeof(struct acpi_table_header)); 168 sizeof(struct acpi_table_header));
@@ -175,9 +172,7 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
175 /* Validate the table length */ 172 /* Validate the table length */
176 173
177 if (table_header->length < sizeof(struct acpi_table_header)) { 174 if (table_header->length < sizeof(struct acpi_table_header)) {
178 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 175 ACPI_REPORT_ERROR(("Invalid length in table header %p name %4.4s\n", table_header, (char *)&signature));
179 "Invalid length in table header %p name %4.4s\n",
180 table_header, (char *)&signature));
181 176
182 ACPI_REPORT_WARNING(("Invalid table header length (0x%X) found\n", (u32) table_header->length)); 177 ACPI_REPORT_WARNING(("Invalid table header length (0x%X) found\n", (u32) table_header->length));
183 178
@@ -291,8 +286,7 @@ acpi_tb_handle_to_object(u16 table_id,
291 } 286 }
292 } 287 }
293 288
294 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "table_id=%X does not exist\n", 289 ACPI_REPORT_ERROR(("table_id=%X does not exist\n", table_id));
295 table_id));
296 return (AE_BAD_PARAMETER); 290 return (AE_BAD_PARAMETER);
297} 291}
298#endif 292#endif
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 3f96a4909aad..83a9ca8cb98c 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,7 @@ acpi_status acpi_load_tables(void)
75 status = acpi_os_get_root_pointer(ACPI_LOGICAL_ADDRESSING, 75 status = acpi_os_get_root_pointer(ACPI_LOGICAL_ADDRESSING,
76 &rsdp_address); 76 &rsdp_address);
77 if (ACPI_FAILURE(status)) { 77 if (ACPI_FAILURE(status)) {
78 ACPI_REPORT_ERROR(("acpi_load_tables: Could not get RSDP, %s\n", 78 ACPI_REPORT_ERROR(("Could not get RSDP, %s\n",
79 acpi_format_exception(status))); 79 acpi_format_exception(status)));
80 goto error_exit; 80 goto error_exit;
81 } 81 }
@@ -86,7 +86,8 @@ acpi_status acpi_load_tables(void)
86 86
87 status = acpi_tb_verify_rsdp(&rsdp_address); 87 status = acpi_tb_verify_rsdp(&rsdp_address);
88 if (ACPI_FAILURE(status)) { 88 if (ACPI_FAILURE(status)) {
89 ACPI_REPORT_ERROR(("acpi_load_tables: RSDP Failed validation: %s\n", acpi_format_exception(status))); 89 ACPI_REPORT_ERROR(("RSDP Failed validation: %s\n",
90 acpi_format_exception(status)));
90 goto error_exit; 91 goto error_exit;
91 } 92 }
92 93
@@ -94,7 +95,8 @@ acpi_status acpi_load_tables(void)
94 95
95 status = acpi_tb_get_table_rsdt(); 96 status = acpi_tb_get_table_rsdt();
96 if (ACPI_FAILURE(status)) { 97 if (ACPI_FAILURE(status)) {
97 ACPI_REPORT_ERROR(("acpi_load_tables: Could not load RSDT: %s\n", acpi_format_exception(status))); 98 ACPI_REPORT_ERROR(("Could not load RSDT: %s\n",
99 acpi_format_exception(status)));
98 goto error_exit; 100 goto error_exit;
99 } 101 }
100 102
@@ -102,7 +104,7 @@ acpi_status acpi_load_tables(void)
102 104
103 status = acpi_tb_get_required_tables(); 105 status = acpi_tb_get_required_tables();
104 if (ACPI_FAILURE(status)) { 106 if (ACPI_FAILURE(status)) {
105 ACPI_REPORT_ERROR(("acpi_load_tables: Error getting required tables (DSDT/FADT/FACS): %s\n", acpi_format_exception(status))); 107 ACPI_REPORT_ERROR(("Could not get all required tables (DSDT/FADT/FACS): %s\n", acpi_format_exception(status)));
106 goto error_exit; 108 goto error_exit;
107 } 109 }
108 110
@@ -112,14 +114,15 @@ acpi_status acpi_load_tables(void)
112 114
113 status = acpi_ns_load_namespace(); 115 status = acpi_ns_load_namespace();
114 if (ACPI_FAILURE(status)) { 116 if (ACPI_FAILURE(status)) {
115 ACPI_REPORT_ERROR(("acpi_load_tables: Could not load namespace: %s\n", acpi_format_exception(status))); 117 ACPI_REPORT_ERROR(("Could not load namespace: %s\n",
118 acpi_format_exception(status)));
116 goto error_exit; 119 goto error_exit;
117 } 120 }
118 121
119 return_ACPI_STATUS(AE_OK); 122 return_ACPI_STATUS(AE_OK);
120 123
121 error_exit: 124 error_exit:
122 ACPI_REPORT_ERROR(("acpi_load_tables: Could not load tables: %s\n", 125 ACPI_REPORT_ERROR(("Could not load tables: %s\n",
123 acpi_format_exception(status))); 126 acpi_format_exception(status)));
124 127
125 return_ACPI_STATUS(status); 128 return_ACPI_STATUS(status);
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index b01a4b2ae7da..6538ed818f5b 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.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
@@ -396,9 +396,8 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
396 396
397 status = acpi_tb_find_rsdp(&table_info, flags); 397 status = acpi_tb_find_rsdp(&table_info, flags);
398 if (ACPI_FAILURE(status)) { 398 if (ACPI_FAILURE(status)) {
399 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 399 ACPI_REPORT_ERROR(("RSDP structure not found, %s Flags=%X\n",
400 "RSDP structure not found, %s Flags=%X\n", 400 acpi_format_exception(status), flags));
401 acpi_format_exception(status), flags));
402 401
403 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 402 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
404 } 403 }
@@ -503,10 +502,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
503 ACPI_EBDA_PTR_LENGTH, 502 ACPI_EBDA_PTR_LENGTH,
504 (void *)&table_ptr); 503 (void *)&table_ptr);
505 if (ACPI_FAILURE(status)) { 504 if (ACPI_FAILURE(status)) {
506 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 505 ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
507 "Could not map memory at %8.8X for length %X\n",
508 ACPI_EBDA_PTR_LOCATION,
509 ACPI_EBDA_PTR_LENGTH));
510 506
511 return_ACPI_STATUS(status); 507 return_ACPI_STATUS(status);
512 } 508 }
@@ -530,10 +526,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
530 ACPI_EBDA_WINDOW_SIZE, 526 ACPI_EBDA_WINDOW_SIZE,
531 (void *)&table_ptr); 527 (void *)&table_ptr);
532 if (ACPI_FAILURE(status)) { 528 if (ACPI_FAILURE(status)) {
533 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 529 ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", physical_address, ACPI_EBDA_WINDOW_SIZE));
534 "Could not map memory at %8.8X for length %X\n",
535 physical_address,
536 ACPI_EBDA_WINDOW_SIZE));
537 530
538 return_ACPI_STATUS(status); 531 return_ACPI_STATUS(status);
539 } 532 }
@@ -563,10 +556,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
563 (void *)&table_ptr); 556 (void *)&table_ptr);
564 557
565 if (ACPI_FAILURE(status)) { 558 if (ACPI_FAILURE(status)) {
566 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 559 ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
567 "Could not map memory at %8.8X for length %X\n",
568 ACPI_HI_RSDP_WINDOW_BASE,
569 ACPI_HI_RSDP_WINDOW_SIZE));
570 560
571 return_ACPI_STATUS(status); 561 return_ACPI_STATUS(status);
572 } 562 }
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index b11b7ed788c6..0efcbdf7e620 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.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
@@ -301,7 +301,7 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
301 /* Check for an inadvertent size of zero bytes */ 301 /* Check for an inadvertent size of zero bytes */
302 302
303 if (!size) { 303 if (!size) {
304 _ACPI_REPORT_ERROR(module, line, component, 304 _ACPI_REPORT_ERROR(module, line,
305 ("ut_allocate: Attempt to allocate zero bytes, allocating 1 byte\n")); 305 ("ut_allocate: Attempt to allocate zero bytes, allocating 1 byte\n"));
306 size = 1; 306 size = 1;
307 } 307 }
@@ -310,7 +310,7 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
310 if (!allocation) { 310 if (!allocation) {
311 /* Report allocation error */ 311 /* Report allocation error */
312 312
313 _ACPI_REPORT_ERROR(module, line, component, 313 _ACPI_REPORT_ERROR(module, line,
314 ("ut_allocate: Could not allocate size %X\n", 314 ("ut_allocate: Could not allocate size %X\n",
315 (u32) size)); 315 (u32) size));
316 316
@@ -344,7 +344,7 @@ void *acpi_ut_callocate(acpi_size size, u32 component, char *module, u32 line)
344 /* Check for an inadvertent size of zero bytes */ 344 /* Check for an inadvertent size of zero bytes */
345 345
346 if (!size) { 346 if (!size) {
347 _ACPI_REPORT_ERROR(module, line, component, 347 _ACPI_REPORT_ERROR(module, line,
348 ("ut_callocate: Attempt to allocate zero bytes, allocating 1 byte\n")); 348 ("ut_callocate: Attempt to allocate zero bytes, allocating 1 byte\n"));
349 size = 1; 349 size = 1;
350 } 350 }
@@ -353,7 +353,7 @@ void *acpi_ut_callocate(acpi_size size, u32 component, char *module, u32 line)
353 if (!allocation) { 353 if (!allocation) {
354 /* Report allocation error */ 354 /* Report allocation error */
355 355
356 _ACPI_REPORT_ERROR(module, line, component, 356 _ACPI_REPORT_ERROR(module, line,
357 ("ut_callocate: Could not allocate size %X\n", 357 ("ut_callocate: Could not allocate size %X\n",
358 (u32) size)); 358 (u32) size));
359 return_PTR(NULL); 359 return_PTR(NULL);
@@ -480,7 +480,7 @@ void *acpi_ut_callocate_and_track(acpi_size size,
480 if (!allocation) { 480 if (!allocation) {
481 /* Report allocation error */ 481 /* Report allocation error */
482 482
483 _ACPI_REPORT_ERROR(module, line, component, 483 _ACPI_REPORT_ERROR(module, line,
484 ("ut_callocate: Could not allocate size %X\n", 484 ("ut_callocate: Could not allocate size %X\n",
485 (u32) size)); 485 (u32) size));
486 return (NULL); 486 return (NULL);
@@ -524,7 +524,7 @@ acpi_ut_free_and_track(void *allocation, u32 component, char *module, u32 line)
524 ACPI_FUNCTION_TRACE_PTR("ut_free", allocation); 524 ACPI_FUNCTION_TRACE_PTR("ut_free", allocation);
525 525
526 if (NULL == allocation) { 526 if (NULL == allocation) {
527 _ACPI_REPORT_ERROR(module, line, component, 527 _ACPI_REPORT_ERROR(module, line,
528 ("acpi_ut_free: Attempt to delete a NULL address\n")); 528 ("acpi_ut_free: Attempt to delete a NULL address\n"));
529 529
530 return_VOID; 530 return_VOID;
@@ -540,8 +540,8 @@ acpi_ut_free_and_track(void *allocation, u32 component, char *module, u32 line)
540 status = acpi_ut_remove_allocation(debug_block, 540 status = acpi_ut_remove_allocation(debug_block,
541 component, module, line); 541 component, module, line);
542 if (ACPI_FAILURE(status)) { 542 if (ACPI_FAILURE(status)) {
543 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Could not free memory, %s\n", 543 ACPI_REPORT_ERROR(("Could not free memory, %s\n",
544 acpi_format_exception(status))); 544 acpi_format_exception(status)));
545 } 545 }
546 546
547 acpi_os_free(debug_block); 547 acpi_os_free(debug_block);
@@ -626,8 +626,8 @@ acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
626 if (element) { 626 if (element) {
627 ACPI_REPORT_ERROR(("ut_track_allocation: Allocation already present in list! (%p)\n", allocation)); 627 ACPI_REPORT_ERROR(("ut_track_allocation: Allocation already present in list! (%p)\n", allocation));
628 628
629 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Element %p Address %p\n", 629 ACPI_REPORT_ERROR(("Element %p Address %p\n",
630 element, allocation)); 630 element, allocation));
631 631
632 goto unlock_and_exit; 632 goto unlock_and_exit;
633 } 633 }
@@ -687,7 +687,7 @@ acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
687 if (NULL == mem_list->list_head) { 687 if (NULL == mem_list->list_head) {
688 /* No allocations! */ 688 /* No allocations! */
689 689
690 _ACPI_REPORT_ERROR(module, line, component, 690 _ACPI_REPORT_ERROR(module, line,
691 ("ut_remove_allocation: Empty allocation list, nothing to free!\n")); 691 ("ut_remove_allocation: Empty allocation list, nothing to free!\n"));
692 692
693 return_ACPI_STATUS(AE_OK); 693 return_ACPI_STATUS(AE_OK);
@@ -863,12 +863,10 @@ void acpi_ut_dump_allocations(u32 component, char *module)
863 /* Print summary */ 863 /* Print summary */
864 864
865 if (!num_outstanding) { 865 if (!num_outstanding) {
866 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 866 ACPI_REPORT_INFO(("No outstanding allocations\n"));
867 "No outstanding allocations\n"));
868 } else { 867 } else {
869 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 868 ACPI_REPORT_ERROR(("%d(%X) Outstanding allocations\n",
870 "%d(%X) Outstanding allocations\n", 869 num_outstanding, num_outstanding));
871 num_outstanding, num_outstanding));
872 } 870 }
873 871
874 return_VOID; 872 return_VOID;
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 93d48681d276..2177cb1ef2c4 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.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
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 568df9e42f89..1a4da006822a 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.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
@@ -606,8 +606,7 @@ acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,
606 /* 606 /*
607 * Packages as external input to control methods are not supported, 607 * Packages as external input to control methods are not supported,
608 */ 608 */
609 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 609 ACPI_REPORT_ERROR(("Packages as parameters not implemented!\n"));
610 "Packages as parameters not implemented!\n"));
611 610
612 return_ACPI_STATUS(AE_NOT_IMPLEMENTED); 611 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
613 } 612 }
@@ -870,7 +869,7 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
870 count + 869 count +
871 1) * sizeof(void *)); 870 1) * sizeof(void *));
872 if (!dest_obj->package.elements) { 871 if (!dest_obj->package.elements) {
873 ACPI_REPORT_ERROR(("aml_build_copy_internal_package_object: Package allocation failure\n")); 872 ACPI_REPORT_ERROR(("Package allocation failure\n"));
874 return_ACPI_STATUS(AE_NO_MEMORY); 873 return_ACPI_STATUS(AE_NO_MEMORY);
875 } 874 }
876 875
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index d80e92639932..35f3d581e034 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.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
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index 2bc878f7a127..1079a1a1f195 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.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
@@ -363,8 +363,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
363 363
364 default: 364 default:
365 365
366 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown action (%X)\n", 366 ACPI_REPORT_ERROR(("Unknown action (%X)\n", action));
367 action));
368 break; 367 break;
369 } 368 }
370 369
@@ -374,9 +373,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
374 */ 373 */
375 if (count > ACPI_MAX_REFERENCE_COUNT) { 374 if (count > ACPI_MAX_REFERENCE_COUNT) {
376 375
377 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 376 ACPI_REPORT_WARNING(("Large Reference Count (%X) in object %p\n\n", count, object));
378 "**** Warning **** Large Reference Count (%X) in object %p\n\n",
379 count, object));
380 } 377 }
381 378
382 return; 379 return;
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
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 7c59c2b0d953..87ca9a0a8b76 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.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
@@ -67,8 +67,11 @@ const char *acpi_format_exception(acpi_status status)
67 acpi_status sub_status; 67 acpi_status sub_status;
68 const char *exception = NULL; 68 const char *exception = NULL;
69 69
70 ACPI_FUNCTION_NAME("format_exception"); 70 ACPI_FUNCTION_ENTRY();
71 71
72 /*
73 * Status is composed of two parts, a "type" and an actual code
74 */
72 sub_status = (status & ~AE_CODE_MASK); 75 sub_status = (status & ~AE_CODE_MASK);
73 76
74 switch (status & AE_CODE_MASK) { 77 switch (status & AE_CODE_MASK) {
@@ -118,13 +121,13 @@ const char *acpi_format_exception(acpi_status status)
118 if (!exception) { 121 if (!exception) {
119 /* Exception code was not recognized */ 122 /* Exception code was not recognized */
120 123
121 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 124 ACPI_REPORT_ERROR(("Unknown exception code: 0x%8.8X\n",
122 "Unknown exception code: 0x%8.8X\n", status)); 125 status));
123 126
124 return ((const char *)"UNKNOWN_STATUS_CODE"); 127 exception = "UNKNOWN_STATUS_CODE";
125 } 128 }
126 129
127 return ((const char *)exception); 130 return (ACPI_CAST_PTR(const char, exception));
128} 131}
129 132
130/******************************************************************************* 133/*******************************************************************************
@@ -519,7 +522,7 @@ char *acpi_ut_get_event_name(u32 event_id)
519 return ("invalid_event_iD"); 522 return ("invalid_event_iD");
520 } 523 }
521 524
522 return ((char *)acpi_gbl_event_types[event_id]); 525 return (ACPI_CAST_PTR(char, acpi_gbl_event_types[event_id]));
523} 526}
524 527
525/******************************************************************************* 528/*******************************************************************************
@@ -586,10 +589,10 @@ char *acpi_ut_get_type_name(acpi_object_type type)
586{ 589{
587 590
588 if (type > ACPI_TYPE_INVALID) { 591 if (type > ACPI_TYPE_INVALID) {
589 return ((char *)acpi_gbl_bad_type); 592 return (ACPI_CAST_PTR(char, acpi_gbl_bad_type));
590 } 593 }
591 594
592 return ((char *)acpi_gbl_ns_type_names[type]); 595 return (ACPI_CAST_PTR(char, acpi_gbl_ns_type_names[type]));
593} 596}
594 597
595char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc) 598char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c
index 9dde82b0beaf..7565ba6f90d5 100644
--- a/drivers/acpi/utilities/utinit.c
+++ b/drivers/acpi/utilities/utinit.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
@@ -221,15 +221,14 @@ void acpi_ut_subsystem_shutdown(void)
221 /* Just exit if subsystem is already shutdown */ 221 /* Just exit if subsystem is already shutdown */
222 222
223 if (acpi_gbl_shutdown) { 223 if (acpi_gbl_shutdown) {
224 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 224 ACPI_REPORT_ERROR(("ACPI Subsystem is already terminated\n"));
225 "ACPI Subsystem is already terminated\n"));
226 return_VOID; 225 return_VOID;
227 } 226 }
228 227
229 /* Subsystem appears active, go ahead and shut it down */ 228 /* Subsystem appears active, go ahead and shut it down */
230 229
231 acpi_gbl_shutdown = TRUE; 230 acpi_gbl_shutdown = TRUE;
232 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem...\n")); 231 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
233 232
234 /* Close the acpi_event Handling */ 233 /* Close the acpi_event Handling */
235 234
diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c
index 68a0a6f94129..06214201329d 100644
--- a/drivers/acpi/utilities/utmath.c
+++ b/drivers/acpi/utilities/utmath.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
@@ -82,7 +82,7 @@ acpi_ut_short_divide(acpi_integer dividend,
82 /* Always check for a zero divisor */ 82 /* Always check for a zero divisor */
83 83
84 if (divisor == 0) { 84 if (divisor == 0) {
85 ACPI_REPORT_ERROR(("acpi_ut_short_divide: Divide by zero\n")); 85 ACPI_REPORT_ERROR(("Divide by zero\n"));
86 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO); 86 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
87 } 87 }
88 88
@@ -144,7 +144,7 @@ acpi_ut_divide(acpi_integer in_dividend,
144 /* Always check for a zero divisor */ 144 /* Always check for a zero divisor */
145 145
146 if (in_divisor == 0) { 146 if (in_divisor == 0) {
147 ACPI_REPORT_ERROR(("acpi_ut_divide: Divide by zero\n")); 147 ACPI_REPORT_ERROR(("Divide by zero\n"));
148 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO); 148 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
149 } 149 }
150 150
@@ -266,7 +266,7 @@ acpi_ut_short_divide(acpi_integer in_dividend,
266 /* Always check for a zero divisor */ 266 /* Always check for a zero divisor */
267 267
268 if (divisor == 0) { 268 if (divisor == 0) {
269 ACPI_REPORT_ERROR(("acpi_ut_short_divide: Divide by zero\n")); 269 ACPI_REPORT_ERROR(("Divide by zero\n"));
270 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO); 270 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
271 } 271 }
272 272
@@ -292,7 +292,7 @@ acpi_ut_divide(acpi_integer in_dividend,
292 /* Always check for a zero divisor */ 292 /* Always check for a zero divisor */
293 293
294 if (in_divisor == 0) { 294 if (in_divisor == 0) {
295 ACPI_REPORT_ERROR(("acpi_ut_divide: Divide by zero\n")); 295 ACPI_REPORT_ERROR(("Divide by zero\n"));
296 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO); 296 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
297 } 297 }
298 298
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 48d511d5c04b..a77ffcd5570f 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.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
@@ -841,7 +841,6 @@ u8 acpi_ut_generate_checksum(u8 * buffer, u32 length)
841 * 841 *
842 * PARAMETERS: module_name - Caller's module name (for error output) 842 * PARAMETERS: module_name - Caller's module name (for error output)
843 * line_number - Caller's line number (for error output) 843 * line_number - Caller's line number (for error output)
844 * component_id - Caller's component ID (for error output)
845 * 844 *
846 * RETURN: None 845 * RETURN: None
847 * 846 *
@@ -849,10 +848,10 @@ u8 acpi_ut_generate_checksum(u8 * buffer, u32 length)
849 * 848 *
850 ******************************************************************************/ 849 ******************************************************************************/
851 850
852void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id) 851void acpi_ut_report_error(char *module_name, u32 line_number)
853{ 852{
854 853
855 acpi_os_printf("%8s-%04d: *** Error: ", module_name, line_number); 854 acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);
856} 855}
857 856
858/******************************************************************************* 857/*******************************************************************************
@@ -861,7 +860,6 @@ void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id)
861 * 860 *
862 * PARAMETERS: module_name - Caller's module name (for error output) 861 * PARAMETERS: module_name - Caller's module name (for error output)
863 * line_number - Caller's line number (for error output) 862 * line_number - Caller's line number (for error output)
864 * component_id - Caller's component ID (for error output)
865 * 863 *
866 * RETURN: None 864 * RETURN: None
867 * 865 *
@@ -869,11 +867,10 @@ void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id)
869 * 867 *
870 ******************************************************************************/ 868 ******************************************************************************/
871 869
872void 870void acpi_ut_report_warning(char *module_name, u32 line_number)
873acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id)
874{ 871{
875 872
876 acpi_os_printf("%8s-%04d: *** Warning: ", module_name, line_number); 873 acpi_os_printf("ACPI Warning (%s-%04d): ", module_name, line_number);
877} 874}
878 875
879/******************************************************************************* 876/*******************************************************************************
@@ -882,7 +879,6 @@ acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id)
882 * 879 *
883 * PARAMETERS: module_name - Caller's module name (for error output) 880 * PARAMETERS: module_name - Caller's module name (for error output)
884 * line_number - Caller's line number (for error output) 881 * line_number - Caller's line number (for error output)
885 * component_id - Caller's component ID (for error output)
886 * 882 *
887 * RETURN: None 883 * RETURN: None
888 * 884 *
@@ -890,8 +886,8 @@ acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id)
890 * 886 *
891 ******************************************************************************/ 887 ******************************************************************************/
892 888
893void acpi_ut_report_info(char *module_name, u32 line_number, u32 component_id) 889void acpi_ut_report_info(char *module_name, u32 line_number)
894{ 890{
895 891
896 acpi_os_printf("%8s-%04d: *** Info: ", module_name, line_number); 892 acpi_os_printf("ACPI (%s-%04d): ", module_name, line_number);
897} 893}
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index e158b1b6313b..ffaff55270b1 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.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
@@ -216,21 +216,12 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
216 for (i = mutex_id; i < MAX_MUTEX; i++) { 216 for (i = mutex_id; i < MAX_MUTEX; i++) {
217 if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) { 217 if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
218 if (i == mutex_id) { 218 if (i == mutex_id) {
219 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 219 ACPI_REPORT_ERROR(("Mutex [%s] already acquired by this thread [%X]\n", acpi_ut_get_mutex_name(mutex_id), this_thread_id));
220 "Mutex [%s] already acquired by this thread [%X]\n",
221 acpi_ut_get_mutex_name
222 (mutex_id),
223 this_thread_id));
224 220
225 return (AE_ALREADY_ACQUIRED); 221 return (AE_ALREADY_ACQUIRED);
226 } 222 }
227 223
228 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 224 ACPI_REPORT_ERROR(("Invalid acquire order: Thread %X owns [%s], wants [%s]\n", this_thread_id, acpi_ut_get_mutex_name(i), acpi_ut_get_mutex_name(mutex_id)));
229 "Invalid acquire order: Thread %X owns [%s], wants [%s]\n",
230 this_thread_id,
231 acpi_ut_get_mutex_name(i),
232 acpi_ut_get_mutex_name
233 (mutex_id)));
234 225
235 return (AE_ACQUIRE_DEADLOCK); 226 return (AE_ACQUIRE_DEADLOCK);
236 } 227 }
@@ -253,11 +244,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
253 acpi_gbl_mutex_info[mutex_id].use_count++; 244 acpi_gbl_mutex_info[mutex_id].use_count++;
254 acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id; 245 acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;
255 } else { 246 } else {
256 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 247 ACPI_REPORT_ERROR(("Thread %X could not acquire Mutex [%X] %s\n", this_thread_id, mutex_id, acpi_format_exception(status)));
257 "Thread %X could not acquire Mutex [%s] %s\n",
258 this_thread_id,
259 acpi_ut_get_mutex_name(mutex_id),
260 acpi_format_exception(status)));
261 } 248 }
262 249
263 return (status); 250 return (status);
@@ -295,9 +282,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
295 * Mutex must be acquired in order to release it! 282 * Mutex must be acquired in order to release it!
296 */ 283 */
297 if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) { 284 if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) {
298 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 285 ACPI_REPORT_ERROR(("Mutex [%X] is not acquired, cannot release\n", mutex_id));
299 "Mutex [%s] is not acquired, cannot release\n",
300 acpi_ut_get_mutex_name(mutex_id)));
301 286
302 return (AE_NOT_ACQUIRED); 287 return (AE_NOT_ACQUIRED);
303 } 288 }
@@ -318,11 +303,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
318 continue; 303 continue;
319 } 304 }
320 305
321 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 306 ACPI_REPORT_ERROR(("Invalid release order: owns [%s], releasing [%s]\n", acpi_ut_get_mutex_name(i), acpi_ut_get_mutex_name(mutex_id)));
322 "Invalid release order: owns [%s], releasing [%s]\n",
323 acpi_ut_get_mutex_name(i),
324 acpi_ut_get_mutex_name
325 (mutex_id)));
326 307
327 return (AE_RELEASE_DEADLOCK); 308 return (AE_RELEASE_DEADLOCK);
328 } 309 }
@@ -338,11 +319,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
338 acpi_os_signal_semaphore(acpi_gbl_mutex_info[mutex_id].mutex, 1); 319 acpi_os_signal_semaphore(acpi_gbl_mutex_info[mutex_id].mutex, 1);
339 320
340 if (ACPI_FAILURE(status)) { 321 if (ACPI_FAILURE(status)) {
341 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 322 ACPI_REPORT_ERROR(("Thread %X could not release Mutex [%X] %s\n", this_thread_id, mutex_id, acpi_format_exception(status)));
342 "Thread %X could not release Mutex [%s] %s\n",
343 this_thread_id,
344 acpi_ut_get_mutex_name(mutex_id),
345 acpi_format_exception(status)));
346 } else { 323 } else {
347 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, 324 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
348 "Thread %X released Mutex [%s]\n", 325 "Thread %X released Mutex [%s]\n",
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index 3015e1540053..1b6b21577805 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.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
@@ -177,7 +177,8 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size)
177 177
178 buffer = ACPI_MEM_CALLOCATE(buffer_size); 178 buffer = ACPI_MEM_CALLOCATE(buffer_size);
179 if (!buffer) { 179 if (!buffer) {
180 ACPI_REPORT_ERROR(("create_buffer: could not allocate size %X\n", (u32) buffer_size)); 180 ACPI_REPORT_ERROR(("Could not allocate size %X\n",
181 (u32) buffer_size));
181 acpi_ut_remove_reference(buffer_desc); 182 acpi_ut_remove_reference(buffer_desc);
182 return_PTR(NULL); 183 return_PTR(NULL);
183 } 184 }
@@ -228,7 +229,8 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
228 */ 229 */
229 string = ACPI_MEM_CALLOCATE(string_size + 1); 230 string = ACPI_MEM_CALLOCATE(string_size + 1);
230 if (!string) { 231 if (!string) {
231 ACPI_REPORT_ERROR(("create_string: could not allocate size %X\n", (u32) string_size)); 232 ACPI_REPORT_ERROR(("Could not allocate size %X\n",
233 (u32) string_size));
232 acpi_ut_remove_reference(string_desc); 234 acpi_ut_remove_reference(string_desc);
233 return_PTR(NULL); 235 return_PTR(NULL);
234 } 236 }
@@ -310,7 +312,7 @@ void *acpi_ut_allocate_object_desc_dbg(char *module_name,
310 312
311 object = acpi_os_acquire_object(acpi_gbl_operand_cache); 313 object = acpi_os_acquire_object(acpi_gbl_operand_cache);
312 if (!object) { 314 if (!object) {
313 _ACPI_REPORT_ERROR(module_name, line_number, component_id, 315 _ACPI_REPORT_ERROR(module_name, line_number,
314 ("Could not allocate an object descriptor\n")); 316 ("Could not allocate an object descriptor\n"));
315 317
316 return_PTR(NULL); 318 return_PTR(NULL);
@@ -345,9 +347,9 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
345 /* Object must be an union acpi_operand_object */ 347 /* Object must be an union acpi_operand_object */
346 348
347 if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { 349 if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
348 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 350 ACPI_REPORT_ERROR(("%p is not an ACPI Operand object [%s]\n",
349 "%p is not an ACPI Operand object [%s]\n", 351 object,
350 object, acpi_ut_get_descriptor_name(object))); 352 acpi_ut_get_descriptor_name(object)));
351 return_VOID; 353 return_VOID;
352 } 354 }
353 355
@@ -449,10 +451,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
449 * Notably, Locals and Args are not supported, but this may be 451 * Notably, Locals and Args are not supported, but this may be
450 * required eventually. 452 * required eventually.
451 */ 453 */
452 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 454 ACPI_REPORT_ERROR(("Unsupported Reference opcode=%X in object %p\n", internal_object->reference.opcode, internal_object));
453 "Unsupported Reference opcode=%X in object %p\n",
454 internal_object->reference.opcode,
455 internal_object));
456 status = AE_TYPE; 455 status = AE_TYPE;
457 break; 456 break;
458 } 457 }
@@ -460,10 +459,9 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
460 459
461 default: 460 default:
462 461
463 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 462 ACPI_REPORT_ERROR(("Unsupported type=%X in object %p\n",
464 "Unsupported type=%X in object %p\n", 463 ACPI_GET_OBJECT_TYPE(internal_object),
465 ACPI_GET_OBJECT_TYPE(internal_object), 464 internal_object));
466 internal_object));
467 status = AE_TYPE; 465 status = AE_TYPE;
468 break; 466 break;
469 } 467 }
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c
index eaf0edec6efe..36bf9e4bf529 100644
--- a/drivers/acpi/utilities/utresrc.c
+++ b/drivers/acpi/utilities/utresrc.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
diff --git a/drivers/acpi/utilities/utstate.c b/drivers/acpi/utilities/utstate.c
index 6ff1d7073349..4b134a722907 100644
--- a/drivers/acpi/utilities/utstate.c
+++ b/drivers/acpi/utilities/utstate.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
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index 57adc5bc02f3..b4bc94883200 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.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
@@ -75,7 +75,7 @@ acpi_status acpi_initialize_subsystem(void)
75 75
76 status = acpi_os_initialize(); 76 status = acpi_os_initialize();
77 if (ACPI_FAILURE(status)) { 77 if (ACPI_FAILURE(status)) {
78 ACPI_REPORT_ERROR(("OSD failed to initialize, %s\n", 78 ACPI_REPORT_ERROR(("OSL failed to initialize, %s\n",
79 acpi_format_exception(status))); 79 acpi_format_exception(status)));
80 return_ACPI_STATUS(status); 80 return_ACPI_STATUS(status);
81 } 81 }
@@ -154,8 +154,7 @@ acpi_status acpi_enable_subsystem(u32 flags)
154 154
155 status = acpi_enable(); 155 status = acpi_enable();
156 if (ACPI_FAILURE(status)) { 156 if (ACPI_FAILURE(status)) {
157 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 157 ACPI_REPORT_WARNING(("acpi_enable failed\n"));
158 "acpi_enable failed.\n"));
159 return_ACPI_STATUS(status); 158 return_ACPI_STATUS(status);
160 } 159 }
161 } 160 }
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 1f2477eb95fe..675a32f78329 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -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
@@ -63,7 +63,7 @@
63 63
64/* Current ACPICA subsystem version in YYYYMMDD format */ 64/* Current ACPICA subsystem version in YYYYMMDD format */
65 65
66#define ACPI_CA_VERSION 0x20051216 66#define ACPI_CA_VERSION 0x20060113
67 67
68/* 68/*
69 * OS name, used for the _OS object. The _OS object is essentially obsolete, 69 * OS name, used for the _OS object. The _OS object is essentially obsolete,
diff --git a/include/acpi/acdebug.h b/include/acpi/acdebug.h
index 70ce3b4d006e..d8167095caf3 100644
--- a/include/acpi/acdebug.h
+++ b/include/acpi/acdebug.h
@@ -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
diff --git a/include/acpi/acdisasm.h b/include/acpi/acdisasm.h
index 0a8f49f5d2f1..11a8fe39cb04 100644
--- a/include/acpi/acdisasm.h
+++ b/include/acpi/acdisasm.h
@@ -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
diff --git a/include/acpi/acdispat.h b/include/acpi/acdispat.h
index cc6407eef701..c41a926ff317 100644
--- a/include/acpi/acdispat.h
+++ b/include/acpi/acdispat.h
@@ -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
diff --git a/include/acpi/acevents.h b/include/acpi/acevents.h
index b40062c3ba7a..f2717be4fe0d 100644
--- a/include/acpi/acevents.h
+++ b/include/acpi/acevents.h
@@ -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
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 4f005eb65928..dc768aa580e4 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -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
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index dfb3b2493ae5..734cc77bf2c7 100644
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -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
diff --git a/include/acpi/achware.h b/include/acpi/achware.h
index 3644d7248e7e..29b60a8c0593 100644
--- a/include/acpi/achware.h
+++ b/include/acpi/achware.h
@@ -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
diff --git a/include/acpi/acinterp.h b/include/acpi/acinterp.h
index 87e5e44572ca..9f22cfcb624b 100644
--- a/include/acpi/acinterp.h
+++ b/include/acpi/acinterp.h
@@ -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
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h
index da7f1cb96f5d..97f8e4185e4f 100644
--- a/include/acpi/aclocal.h
+++ b/include/acpi/aclocal.h
@@ -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
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
index 0fa8f72dbace..49ba151766de 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -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
@@ -443,56 +443,66 @@
443#define INCREMENT_ARG_LIST(list) (list >>= ((u32) ARG_TYPE_WIDTH)) 443#define INCREMENT_ARG_LIST(list) (list >>= ((u32) ARG_TYPE_WIDTH))
444 444
445/* 445/*
446 * Reporting macros that are never compiled out 446 * Module name is include in both debug and non-debug versions primarily for
447 * error messages. The __FILE__ macro is not very useful for this, because it
448 * often includes the entire pathname to the module
447 */ 449 */
448#define ACPI_PARAM_LIST(pl) pl 450#if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES)
451
452#define ACPI_MODULE_NAME(name) static char ACPI_UNUSED_VAR *_acpi_module_name = name;
453#else
454#define ACPI_MODULE_NAME(name)
455#endif
449 456
450/* 457/*
451 * Error reporting. These versions add callers module and line#. 458 * Ascii error messages can be configured out
452 *
453 * Since _acpi_module_name gets compiled out when ACPI_DEBUG_OUTPUT
454 * isn't defined, only use it in debug mode.
455 */ 459 */
456#ifdef ACPI_DEBUG_OUTPUT 460#ifndef ACPI_NO_ERROR_MESSAGES
461
462#define ACPI_PARAM_LIST(pl) pl
463#define ACPI_LOCATION_INFO _acpi_module_name, __LINE__
457 464
458#define ACPI_REPORT_INFO(fp) {acpi_ut_report_info(_acpi_module_name,__LINE__,_COMPONENT); \ 465/*
459 acpi_os_printf ACPI_PARAM_LIST(fp);} 466 * Error reporting. Callers module and line number are inserted automatically
460#define ACPI_REPORT_ERROR(fp) {acpi_ut_report_error(_acpi_module_name,__LINE__,_COMPONENT); \ 467 * These macros are used for both the debug and non-debug versions of the code
461 acpi_os_printf ACPI_PARAM_LIST(fp);} 468 */
462#define ACPI_REPORT_WARNING(fp) {acpi_ut_report_warning(_acpi_module_name,__LINE__,_COMPONENT); \ 469#define ACPI_REPORT_INFO(fp) {acpi_ut_report_info (ACPI_LOCATION_INFO); \
463 acpi_os_printf ACPI_PARAM_LIST(fp);} 470 acpi_os_printf ACPI_PARAM_LIST (fp);}
464#define ACPI_REPORT_NSERROR(s,e) acpi_ns_report_error(_acpi_module_name,__LINE__,_COMPONENT, s, e); 471#define ACPI_REPORT_ERROR(fp) {acpi_ut_report_error (ACPI_LOCATION_INFO); \
472 acpi_os_printf ACPI_PARAM_LIST (fp);}
473#define ACPI_REPORT_WARNING(fp) {acpi_ut_report_warning (ACPI_LOCATION_INFO); \
474 acpi_os_printf ACPI_PARAM_LIST (fp);}
475#define ACPI_REPORT_NSERROR(s,e) acpi_ns_report_error (ACPI_LOCATION_INFO, \
476 s, e);
477#define ACPI_REPORT_MTERROR(s,n,p,e) acpi_ns_report_method_error (ACPI_LOCATION_INFO, \
478 s, n, p, e);
465 479
466#define ACPI_REPORT_METHOD_ERROR(s,n,p,e) acpi_ns_report_method_error(_acpi_module_name,__LINE__,_COMPONENT, s, n, p, e); 480/* Error reporting. These versions pass thru the module and lineno */
467 481
482#define _ACPI_REPORT_INFO(a,b,fp) {acpi_ut_report_info (a,b); \
483 acpi_os_printf ACPI_PARAM_LIST (fp);}
484#define _ACPI_REPORT_ERROR(a,b,fp) {acpi_ut_report_error (a,b); \
485 acpi_os_printf ACPI_PARAM_LIST (fp);}
486#define _ACPI_REPORT_WARNING(a,b,fp) {acpi_ut_report_warning (a,b); \
487 acpi_os_printf ACPI_PARAM_LIST (fp);}
468#else 488#else
469 489
470#define ACPI_REPORT_INFO(fp) {acpi_ut_report_info("ACPI",__LINE__,_COMPONENT); \ 490/* No error messages */
471 acpi_os_printf ACPI_PARAM_LIST(fp);}
472#define ACPI_REPORT_ERROR(fp) {acpi_ut_report_error("ACPI",__LINE__,_COMPONENT); \
473 acpi_os_printf ACPI_PARAM_LIST(fp);}
474#define ACPI_REPORT_WARNING(fp) {acpi_ut_report_warning("ACPI",__LINE__,_COMPONENT); \
475 acpi_os_printf ACPI_PARAM_LIST(fp);}
476#define ACPI_REPORT_NSERROR(s,e) acpi_ns_report_error("ACPI",__LINE__,_COMPONENT, s, e);
477
478#define ACPI_REPORT_METHOD_ERROR(s,n,p,e) acpi_ns_report_method_error("ACPI",__LINE__,_COMPONENT, s, n, p, e);
479 491
492#define ACPI_REPORT_INFO(fp)
493#define ACPI_REPORT_ERROR(fp)
494#define ACPI_REPORT_WARNING(fp)
495#define ACPI_REPORT_NSERROR(s,e)
496#define ACPI_REPORT_MTERROR(s,n,p,e)
497#define _ACPI_REPORT_INFO(a,b,c,fp)
498#define _ACPI_REPORT_ERROR(a,b,c,fp)
499#define _ACPI_REPORT_WARNING(a,b,c,fp)
480#endif 500#endif
481 501
482/* Error reporting. These versions pass thru the module and line# */
483
484#define _ACPI_REPORT_INFO(a,b,c,fp) {acpi_ut_report_info(a,b,c); \
485 acpi_os_printf ACPI_PARAM_LIST(fp);}
486#define _ACPI_REPORT_ERROR(a,b,c,fp) {acpi_ut_report_error(a,b,c); \
487 acpi_os_printf ACPI_PARAM_LIST(fp);}
488#define _ACPI_REPORT_WARNING(a,b,c,fp) {acpi_ut_report_warning(a,b,c); \
489 acpi_os_printf ACPI_PARAM_LIST(fp);}
490
491/* 502/*
492 * Debug macros that are conditionally compiled 503 * Debug macros that are conditionally compiled
493 */ 504 */
494#ifdef ACPI_DEBUG_OUTPUT 505#ifdef ACPI_DEBUG_OUTPUT
495#define ACPI_MODULE_NAME(name) static char ACPI_UNUSED_VAR *_acpi_module_name = name;
496 506
497/* 507/*
498 * Common parameters used for debug output functions: 508 * Common parameters used for debug output functions:
@@ -649,9 +659,6 @@
649 * This is the non-debug case -- make everything go away, 659 * This is the non-debug case -- make everything go away,
650 * leaving no executable debug code! 660 * leaving no executable debug code!
651 */ 661 */
652#define ACPI_MODULE_NAME(name)
653#define _acpi_module_name ""
654
655#define ACPI_DEBUG_EXEC(a) 662#define ACPI_DEBUG_EXEC(a)
656#define ACPI_NORMAL_EXEC(a) a; 663#define ACPI_NORMAL_EXEC(a) a;
657 664
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h
index 4f9063f3e951..b67da3636899 100644
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
@@ -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
diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h
index dd3501f7e5d6..b667a804fc8a 100644
--- a/include/acpi/acnamesp.h
+++ b/include/acpi/acnamesp.h
@@ -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
@@ -263,13 +263,11 @@ u32 acpi_ns_local(acpi_object_type type);
263void 263void
264acpi_ns_report_error(char *module_name, 264acpi_ns_report_error(char *module_name,
265 u32 line_number, 265 u32 line_number,
266 u32 component_id,
267 char *internal_name, acpi_status lookup_status); 266 char *internal_name, acpi_status lookup_status);
268 267
269void 268void
270acpi_ns_report_method_error(char *module_name, 269acpi_ns_report_method_error(char *module_name,
271 u32 line_number, 270 u32 line_number,
272 u32 component_id,
273 char *message, 271 char *message,
274 struct acpi_namespace_node *node, 272 struct acpi_namespace_node *node,
275 char *path, acpi_status lookup_status); 273 char *path, acpi_status lookup_status);
diff --git a/include/acpi/acobject.h b/include/acpi/acobject.h
index 4a326ba6d482..1bd411962c77 100644
--- a/include/acpi/acobject.h
+++ b/include/acpi/acobject.h
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acopcode.h b/include/acpi/acopcode.h
index 64da42992199..e6d78bd9e90a 100644
--- a/include/acpi/acopcode.h
+++ b/include/acpi/acopcode.h
@@ -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
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 68d7edf0f697..7785d481dc3e 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -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
@@ -137,13 +137,19 @@
137 137
138/* Exception level -- used in the global "debug_level" */ 138/* Exception level -- used in the global "debug_level" */
139 139
140#define ACPI_DB_ERROR ACPI_DEBUG_LEVEL (ACPI_LV_ERROR)
141#define ACPI_DB_WARN ACPI_DEBUG_LEVEL (ACPI_LV_WARN)
142#define ACPI_DB_INIT ACPI_DEBUG_LEVEL (ACPI_LV_INIT) 140#define ACPI_DB_INIT ACPI_DEBUG_LEVEL (ACPI_LV_INIT)
143#define ACPI_DB_DEBUG_OBJECT ACPI_DEBUG_LEVEL (ACPI_LV_DEBUG_OBJECT) 141#define ACPI_DB_DEBUG_OBJECT ACPI_DEBUG_LEVEL (ACPI_LV_DEBUG_OBJECT)
144#define ACPI_DB_INFO ACPI_DEBUG_LEVEL (ACPI_LV_INFO) 142#define ACPI_DB_INFO ACPI_DEBUG_LEVEL (ACPI_LV_INFO)
145#define ACPI_DB_ALL_EXCEPTIONS ACPI_DEBUG_LEVEL (ACPI_LV_ALL_EXCEPTIONS) 143#define ACPI_DB_ALL_EXCEPTIONS ACPI_DEBUG_LEVEL (ACPI_LV_ALL_EXCEPTIONS)
146 144
145/*
146 * These two levels are essentially obsolete, all instances in the
147 * ACPICA core code have been replaced by REPORT_ERROR and REPORT_WARNING
148 * (Kept here because some drivers may still use them)
149 */
150#define ACPI_DB_ERROR ACPI_DEBUG_LEVEL (ACPI_LV_ERROR)
151#define ACPI_DB_WARN ACPI_DEBUG_LEVEL (ACPI_LV_WARN)
152
147/* Trace level -- also used in the global "debug_level" */ 153/* Trace level -- also used in the global "debug_level" */
148 154
149#define ACPI_DB_INIT_NAMES ACPI_DEBUG_LEVEL (ACPI_LV_INIT_NAMES) 155#define ACPI_DB_INIT_NAMES ACPI_DEBUG_LEVEL (ACPI_LV_INIT_NAMES)
diff --git a/include/acpi/acparser.h b/include/acpi/acparser.h
index d352d40de1f3..5a1ff484af33 100644
--- a/include/acpi/acparser.h
+++ b/include/acpi/acparser.h
@@ -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
diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h
index ccf34f9dac64..b9a39d1009bd 100644
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.h
@@ -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
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 58473f60755f..768f63f391cd 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -8,7 +8,7 @@
8 *****************************************************************************/ 8 *****************************************************************************/
9 9
10/* 10/*
11 * Copyright (C) 2000 - 2005, R. Byron Moore 11 * Copyright (C) 2000 - 2006, R. Byron Moore
12 * All rights reserved. 12 * All rights reserved.
13 * 13 *
14 * Redistribution and use in source and binary forms, with or without 14 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 2a88429bc4ec..66cf2ecef57a 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acresrc.h b/include/acpi/acresrc.h
index ba281f7740a0..fa02e8083381 100644
--- a/include/acpi/acresrc.h
+++ b/include/acpi/acresrc.h
@@ -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
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
index 99d235339801..d8c1c2cdac0c 100644
--- a/include/acpi/acstruct.h
+++ b/include/acpi/acstruct.h
@@ -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
diff --git a/include/acpi/actables.h b/include/acpi/actables.h
index f92c1858b808..30a47542e1c8 100644
--- a/include/acpi/actables.h
+++ b/include/acpi/actables.h
@@ -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
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index ef2ddcadfe61..ed53f842dad4 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -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
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 67312c3a915a..cd428d57add0 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -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
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 50305ce2681a..dfc7ac1094bb 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -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
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 18e1338c5c7f..74819e9b4699 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -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
diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h
index 5fa21e03a62f..10f6625f6390 100644
--- a/include/acpi/acutils.h
+++ b/include/acpi/acutils.h
@@ -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
@@ -275,12 +275,11 @@ acpi_ut_ptr_exit(u32 line_number,
275 const char *function_name, 275 const char *function_name,
276 char *module_name, u32 component_id, u8 * ptr); 276 char *module_name, u32 component_id, u8 * ptr);
277 277
278void acpi_ut_report_info(char *module_name, u32 line_number, u32 component_id); 278void acpi_ut_report_error(char *module_name, u32 line_number);
279 279
280void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id); 280void acpi_ut_report_info(char *module_name, u32 line_number);
281 281
282void 282void acpi_ut_report_warning(char *module_name, u32 line_number);
283acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id);
284 283
285void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id); 284void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id);
286 285
diff --git a/include/acpi/amlcode.h b/include/acpi/amlcode.h
index 7fdf5299f501..37964a59aef8 100644
--- a/include/acpi/amlcode.h
+++ b/include/acpi/amlcode.h
@@ -7,7 +7,7 @@
7 *****************************************************************************/ 7 *****************************************************************************/
8 8
9/* 9/*
10 * Copyright (C) 2000 - 2005, R. Byron Moore 10 * Copyright (C) 2000 - 2006, R. Byron Moore
11 * All rights reserved. 11 * All rights reserved.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/amlresrc.h b/include/acpi/amlresrc.h
index 2e3382c1e5e3..fb4735315ad3 100644
--- a/include/acpi/amlresrc.h
+++ b/include/acpi/amlresrc.h
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 53aa997f05fc..31b0f18342f6 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -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
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h
index 4c0e0ba09ba0..ea2a6322f64d 100644
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
@@ -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
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 1b9cbf05b79e..c21c27fe7e1e 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -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