diff options
Diffstat (limited to 'drivers/acpi/dispatcher')
-rw-r--r-- | drivers/acpi/dispatcher/dsfield.c | 9 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dsinit.c | 20 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dsmethod.c | 2 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dsmthdat.c | 28 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dsobject.c | 21 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dsopcode.c | 41 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dsutils.c | 18 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dswexec.c | 36 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dswload.c | 2 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dswscope.c | 6 | ||||
-rw-r--r-- | drivers/acpi/dispatcher/dswstate.c | 106 |
11 files changed, 101 insertions, 188 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 | } |