[ACPI] ACPICA 20060113

[deliverable/linux.git] / drivers / acpi / executer / exstore.c

diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index a7d8eea305c2a80f305055a6851bffcb6d8709ab..202ebe1eb9572384b971cedf37cb56de83eacc8d 100644 (file)
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -6,7 +6,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
@@ -250,7 +250,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
        /* Validate parameters */
 
        if (!source_desc || !dest_desc) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null parameter\n"));
+               ACPI_REPORT_ERROR(("Null parameter\n"));
                return_ACPI_STATUS(AE_AML_NO_OPERAND);
        }
 
@@ -290,10 +290,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
 
                /* Destination is not a Reference object */
 
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Target is not a Reference or Constant object - %s [%p]\n",
-                                 acpi_ut_get_object_type_name(dest_desc),
-                                 dest_desc));
+               ACPI_REPORT_ERROR(("Target is not a Reference or Constant object - %s [%p]\n", acpi_ut_get_object_type_name(dest_desc), dest_desc));
 
                ACPI_DUMP_STACK_ENTRY(source_desc);
                ACPI_DUMP_STACK_ENTRY(dest_desc);
@@ -360,7 +357,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
 
        default:
 
-               ACPI_REPORT_ERROR(("ex_store: Unknown Reference opcode %X\n",
+               ACPI_REPORT_ERROR(("Unknown Reference opcode %X\n",
                                   ref_desc->reference.opcode));
                ACPI_DUMP_ENTRY(ref_desc, ACPI_LV_ERROR);
 
@@ -490,10 +487,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
 
                        /* All other types are invalid */
 
-                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                         "Source must be Integer/Buffer/String type, not %s\n",
-                                         acpi_ut_get_object_type_name
-                                         (source_desc)));
+                       ACPI_REPORT_ERROR(("Source must be Integer/Buffer/String type, not %s\n", acpi_ut_get_object_type_name(source_desc)));
                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                }
 
@@ -503,8 +497,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                break;
 
        default:
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Target is not a Package or buffer_field\n"));
+               ACPI_REPORT_ERROR(("Target is not a Package or buffer_field\n"));
                status = AE_AML_OPERAND_TYPE;
                break;
        }