1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 382f63c14ea1..42967baf760d 100644
--- 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
@@ -123,11 +123,10 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                       && (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 +134,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;
 
@@ -280,9 +281,8 @@ 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;