This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / acpi / executer / exstore.c

diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 33fbfed..25464f7 100644 (file)
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -129,8 +129,7 @@ acpi_ex_store (
                /* 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));
+                       "Destination is not a Reference or Constant object [%p]\n", dest_desc));
 
                ACPI_DUMP_STACK_ENTRY (source_desc);
                ACPI_DUMP_STACK_ENTRY (dest_desc);
@@ -183,37 +182,23 @@ acpi_ex_store (
                 * Storing to the Debug object causes the value stored to be
                 * displayed and otherwise has no effect -- see ACPI Specification
                 */
-               ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                       "**** Write to Debug Object: Object %p %s ****:\n\n",
-                       source_desc, acpi_ut_get_object_type_name (source_desc)));
+               ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "**** Write to Debug Object: ****:\n\n"));
 
                ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %s: ",
-                       acpi_ut_get_object_type_name (source_desc)));
-
-               if (!acpi_ut_valid_internal_object (source_desc)) {
-                  ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT,
-                          "%p, Invalid Internal Object!\n", source_desc));
-                  break;
-               }
+                                 acpi_ut_get_object_type_name (source_desc)));
 
                switch (ACPI_GET_OBJECT_TYPE (source_desc)) {
                case ACPI_TYPE_INTEGER:
 
-                       if (acpi_gbl_integer_byte_width == 4) {
-                               ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "0x%8.8X\n",
-                                       (u32) source_desc->integer.value));
-                       }
-                       else {
-                               ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "0x%8.8X%8.8X\n",
+                       ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "0x%8.8X%8.8X\n",
                                        ACPI_FORMAT_UINT64 (source_desc->integer.value)));
-                       }
                        break;
 
 
                case ACPI_TYPE_BUFFER:
 
-                       ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "[0x%.2X]",
-                               (u32) source_desc->buffer.length));
+                       ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Length 0x%.2X",
+                                       (u32) source_desc->buffer.length));
                        ACPI_DUMP_BUFFER (source_desc->buffer.pointer,
                                (source_desc->buffer.length < 32) ? source_desc->buffer.length : 32);
                        break;
@@ -221,22 +206,22 @@ acpi_ex_store (
 
                case ACPI_TYPE_STRING:
 
-                       ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "[0x%.2X] \"%s\"\n",
-                               source_desc->string.length, source_desc->string.pointer));
+                       ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Length 0x%.2X, \"%s\"\n",
+                                       source_desc->string.length, source_desc->string.pointer));
                        break;
 
 
                case ACPI_TYPE_PACKAGE:
 
-                       ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "[0x%.2X] Elements Ptr - %p\n",
-                               source_desc->package.count, source_desc->package.elements));
+                       ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "Size 0x%.2X Elements Ptr - %p\n",
+                                       source_desc->package.count, source_desc->package.elements));
                        break;
 
 
                default:
 
                        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "%p\n",
-                               source_desc));
+                                       source_desc));
                        break;
                }