Pull bugzilla-5452 into release branch

[pandora-kernel.git] / drivers / acpi / executer / exstoren.c

diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 382f63c..591aaf0 100644 (file)
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,7 +72,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
        union acpi_operand_object *source_desc = *source_desc_ptr;
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE("ex_resolve_object");
+       ACPI_FUNCTION_TRACE(ex_resolve_object);
 
        /* Ensure we have a Target that can be stored to */
 
@@ -97,6 +97,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                 */
                if (ACPI_GET_OBJECT_TYPE(source_desc) ==
                    ACPI_TYPE_LOCAL_REFERENCE) {
+
                        /* Resolve a reference object first */
 
                        status =
@@ -121,13 +122,13 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                    !((ACPI_GET_OBJECT_TYPE(source_desc) ==
                       ACPI_TYPE_LOCAL_REFERENCE)
                      && (source_desc->reference.opcode == AML_LOAD_OP))) {
+
                        /* Conversion successful but still not a valid type */
 
-                       ACPI_DEBUG_PRINT((ACPI_DB_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)));
+                       ACPI_ERROR((AE_INFO,
+                                   "Cannot assign type %s to %s (must be type Int/Str/Buf)",
+                                   acpi_ut_get_object_type_name(source_desc),
+                                   acpi_ut_get_type_name(target_type)));
                        status = AE_AML_OPERAND_TYPE;
                }
                break;
@@ -135,9 +136,11 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
        case ACPI_TYPE_LOCAL_ALIAS:
        case ACPI_TYPE_LOCAL_METHOD_ALIAS:
 
-               /* Aliases are resolved by acpi_ex_prep_operands */
-
-               ACPI_REPORT_ERROR(("Store into Alias - should never happen\n"));
+               /*
+                * All aliases should have been resolved earlier, during the
+                * operand resolution phase.
+                */
+               ACPI_ERROR((AE_INFO, "Store into an unresolved Alias object"));
                status = AE_AML_INTERNAL;
                break;
 
@@ -198,7 +201,7 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
        union acpi_operand_object *actual_src_desc;
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_object", source_desc);
+       ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_object, source_desc);
 
        actual_src_desc = source_desc;
        if (!dest_desc) {
@@ -280,15 +283,15 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
                /*
                 * All other types come here.
                 */
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                 "Store into type %s not implemented\n",
-                                 acpi_ut_get_object_type_name(dest_desc)));
+               ACPI_WARNING((AE_INFO, "Store into type %s not implemented",
+                             acpi_ut_get_object_type_name(dest_desc)));
 
                status = AE_NOT_IMPLEMENTED;
                break;
        }
 
        if (actual_src_desc != source_desc) {
+
                /* Delete the intermediate (temporary) source object */
 
                acpi_ut_remove_reference(actual_src_desc);