diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
commit | 33052057e3e2db7f37fc78aa3f25c98f7e989fae (patch) | |
tree | e80a3aa1371f513c833dc94a16674f78faeeeb1d /drivers/acpi/executer/exoparg1.c | |
parent | 00b464debf0038b1628996065f0be564ccfbfd86 (diff) | |
parent | 1113a7e92e483074c6235da59460759e33b9b144 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/executer/exoparg1.c')
-rw-r--r-- | drivers/acpi/executer/exoparg1.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c index 97e34542f5e4..23d0823bcd5e 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_ERROR((AE_INFO, "Unknown AML opcode %X", |
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_ERROR((AE_INFO, "Unknown AML opcode %X", |
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_ERROR((AE_INFO, "Unknown AML opcode %X", |
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,9 @@ 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_ERROR((AE_INFO, |
350 | "BCD digit too large (not decimal): 0x%X\n", | 353 | "BCD digit too large (not decimal): 0x%X", |
351 | temp32)); | 354 | temp32)); |
352 | 355 | ||
353 | status = AE_AML_NUMERIC_OVERFLOW; | 356 | status = AE_AML_NUMERIC_OVERFLOW; |
354 | goto cleanup; | 357 | goto cleanup; |
@@ -393,12 +396,10 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state) | |||
393 | /* Overflow if there is any data left in Digit */ | 396 | /* Overflow if there is any data left in Digit */ |
394 | 397 | ||
395 | if (digit > 0) { | 398 | if (digit > 0) { |
396 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 399 | ACPI_ERROR((AE_INFO, |
397 | "Integer too large to convert to BCD: %8.8X%8.8X\n", | 400 | "Integer too large to convert to BCD: %8.8X%8.8X", |
398 | ACPI_FORMAT_UINT64(operand | 401 | ACPI_FORMAT_UINT64(operand[0]-> |
399 | [0]-> | 402 | integer.value))); |
400 | integer. | ||
401 | value))); | ||
402 | status = AE_AML_NUMERIC_OVERFLOW; | 403 | status = AE_AML_NUMERIC_OVERFLOW; |
403 | goto cleanup; | 404 | goto cleanup; |
404 | } | 405 | } |
@@ -525,15 +526,16 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state) | |||
525 | 526 | ||
526 | /* These are two obsolete opcodes */ | 527 | /* These are two obsolete opcodes */ |
527 | 528 | ||
528 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 529 | ACPI_ERROR((AE_INFO, |
529 | "%s is obsolete and not implemented\n", | 530 | "%s is obsolete and not implemented", |
530 | acpi_ps_get_opcode_name(walk_state->opcode))); | 531 | acpi_ps_get_opcode_name(walk_state->opcode))); |
531 | status = AE_SUPPORT; | 532 | status = AE_SUPPORT; |
532 | goto cleanup; | 533 | goto cleanup; |
533 | 534 | ||
534 | default: /* Unknown opcode */ | 535 | default: /* Unknown opcode */ |
535 | 536 | ||
536 | ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_1R: Unknown opcode %X\n", walk_state->opcode)); | 537 | ACPI_ERROR((AE_INFO, "Unknown AML opcode %X", |
538 | walk_state->opcode)); | ||
537 | status = AE_AML_BAD_OPCODE; | 539 | status = AE_AML_BAD_OPCODE; |
538 | goto cleanup; | 540 | goto cleanup; |
539 | } | 541 | } |
@@ -639,11 +641,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, | 641 | acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc, |
640 | walk_state); | 642 | walk_state); |
641 | if (ACPI_FAILURE(status)) { | 643 | if (ACPI_FAILURE(status)) { |
642 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 644 | ACPI_EXCEPTION((AE_INFO, status, |
643 | "%s: bad operand(s) %s\n", | 645 | "While resolving operands for [%s]", |
644 | acpi_ps_get_opcode_name(walk_state-> | 646 | acpi_ps_get_opcode_name(walk_state-> |
645 | opcode), | 647 | opcode))); |
646 | acpi_format_exception(status))); | ||
647 | 648 | ||
648 | goto cleanup; | 649 | goto cleanup; |
649 | } | 650 | } |
@@ -742,9 +743,9 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
742 | break; | 743 | break; |
743 | 744 | ||
744 | default: | 745 | default: |
745 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 746 | ACPI_ERROR((AE_INFO, |
746 | "size_of - Operand is not Buf/Int/Str/Pkg - found type %s\n", | 747 | "Operand is not Buf/Int/Str/Pkg - found type %s", |
747 | acpi_ut_get_type_name(type))); | 748 | acpi_ut_get_type_name(type))); |
748 | status = AE_AML_OPERAND_TYPE; | 749 | status = AE_AML_OPERAND_TYPE; |
749 | goto cleanup; | 750 | goto cleanup; |
750 | } | 751 | } |
@@ -941,11 +942,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
941 | 942 | ||
942 | default: | 943 | default: |
943 | 944 | ||
944 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 945 | ACPI_ERROR((AE_INFO, |
945 | "Unknown Index target_type %X in obj %p\n", | 946 | "Unknown Index target_type %X in obj %p", |
946 | operand[0]->reference. | 947 | operand[0]->reference. |
947 | target_type, | 948 | target_type, operand[0])); |
948 | operand[0])); | ||
949 | status = AE_AML_OPERAND_TYPE; | 949 | status = AE_AML_OPERAND_TYPE; |
950 | goto cleanup; | 950 | goto cleanup; |
951 | } | 951 | } |
@@ -971,11 +971,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
971 | break; | 971 | break; |
972 | 972 | ||
973 | default: | 973 | default: |
974 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 974 | ACPI_ERROR((AE_INFO, |
975 | "Unknown opcode in ref(%p) - %X\n", | 975 | "Unknown opcode in ref(%p) - %X", |
976 | operand[0], | 976 | operand[0], |
977 | operand[0]->reference. | 977 | operand[0]->reference.opcode)); |
978 | opcode)); | ||
979 | 978 | ||
980 | status = AE_TYPE; | 979 | status = AE_TYPE; |
981 | goto cleanup; | 980 | goto cleanup; |
@@ -985,7 +984,8 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
985 | 984 | ||
986 | default: | 985 | default: |
987 | 986 | ||
988 | ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_1R: Unknown opcode %X\n", walk_state->opcode)); | 987 | ACPI_ERROR((AE_INFO, "Unknown AML opcode %X", |
988 | walk_state->opcode)); | ||
989 | status = AE_AML_BAD_OPCODE; | 989 | status = AE_AML_BAD_OPCODE; |
990 | goto cleanup; | 990 | goto cleanup; |
991 | } | 991 | } |