diff options
Diffstat (limited to 'drivers/acpi/dispatcher/dsobject.c')
-rw-r--r-- | drivers/acpi/dispatcher/dsobject.c | 21 |
1 files changed, 7 insertions, 14 deletions
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; |