diff options
Diffstat (limited to 'drivers/acpi/dispatcher/dsutils.c')
-rw-r--r-- | drivers/acpi/dispatcher/dsutils.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c index cd9aa7faa57..53356a591ac 100644 --- a/drivers/acpi/dispatcher/dsutils.c +++ b/drivers/acpi/dispatcher/dsutils.c | |||
@@ -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_REPORT_ERROR(("Null Op\n")); | 179 | ACPI_ERROR((AE_INFO, "Null Op")); |
180 | return_UINT8(TRUE); | 180 | return_UINT8(TRUE); |
181 | } | 181 | } |
182 | 182 | ||
@@ -216,7 +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_REPORT_ERROR(("Unknown parent opcode Op=%p\n", op)); | 219 | ACPI_ERROR((AE_INFO, "Unknown parent opcode Op=%p", op)); |
220 | return_UINT8(FALSE); | 220 | return_UINT8(FALSE); |
221 | } | 221 | } |
222 | 222 | ||
@@ -343,7 +343,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op, | |||
343 | 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); |
344 | 344 | ||
345 | if (!op) { | 345 | if (!op) { |
346 | ACPI_REPORT_ERROR(("Null Op\n")); | 346 | ACPI_ERROR((AE_INFO, "Null Op")); |
347 | return_VOID; | 347 | return_VOID; |
348 | } | 348 | } |
349 | 349 | ||
@@ -566,7 +566,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state, | |||
566 | } | 566 | } |
567 | 567 | ||
568 | if (ACPI_FAILURE(status)) { | 568 | if (ACPI_FAILURE(status)) { |
569 | ACPI_REPORT_NSERROR(name_string, status); | 569 | ACPI_ERROR_NAMESPACE(name_string, status); |
570 | } | 570 | } |
571 | } | 571 | } |
572 | 572 | ||
@@ -634,7 +634,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state, | |||
634 | * Only error is underflow, and this indicates | 634 | * Only error is underflow, and this indicates |
635 | * a missing or null operand! | 635 | * a missing or null operand! |
636 | */ | 636 | */ |
637 | ACPI_REPORT_ERROR(("Missing or null operand, %s\n", acpi_format_exception(status))); | 637 | ACPI_EXCEPTION((AE_INFO, status, |
638 | "Missing or null operand")); | ||
638 | return_ACPI_STATUS(status); | 639 | return_ACPI_STATUS(status); |
639 | } | 640 | } |
640 | } else { | 641 | } else { |
@@ -726,7 +727,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state, | |||
726 | */ | 727 | */ |
727 | (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state); | 728 | (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state); |
728 | 729 | ||
729 | ACPI_REPORT_ERROR(("While creating Arg %d - %s\n", | 730 | ACPI_EXCEPTION((AE_INFO, status, "While creating Arg %d", |
730 | (arg_count + 1), acpi_format_exception(status))); | 731 | (arg_count + 1))); |
731 | return_ACPI_STATUS(status); | 732 | return_ACPI_STATUS(status); |
732 | } | 733 | } |