This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / acpi / namespace / nsdump.c

diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 57279b2..8afa1dc 100644 (file)
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -198,8 +198,7 @@ acpi_ns_dump_one_object (
        }
 
        if (!acpi_ut_valid_acpi_name (this_node->name.integer)) {
-               ACPI_REPORT_WARNING (("Invalid ACPI Name %08X\n",
-                       this_node->name.integer));
+               ACPI_REPORT_WARNING (("Invalid ACPI Name %08X\n", this_node->name.integer));
        }
 
        /*
@@ -227,8 +226,9 @@ acpi_ns_dump_one_object (
                case ACPI_TYPE_PROCESSOR:
 
                        acpi_os_printf ("ID %X Len %.4X Addr %p\n",
-                               obj_desc->processor.proc_id, obj_desc->processor.length,
-                               (char *) obj_desc->processor.address);
+                                        obj_desc->processor.proc_id,
+                                        obj_desc->processor.length,
+                                        (char *) obj_desc->processor.address);
                        break;
 
 
@@ -241,15 +241,16 @@ acpi_ns_dump_one_object (
                case ACPI_TYPE_METHOD:
 
                        acpi_os_printf ("Args %X Len %.4X Aml %p\n",
-                               (u32) obj_desc->method.param_count,
-                               obj_desc->method.aml_length, obj_desc->method.aml_start);
+                                        (u32) obj_desc->method.param_count,
+                                        obj_desc->method.aml_length,
+                                        obj_desc->method.aml_start);
                        break;
 
 
                case ACPI_TYPE_INTEGER:
 
                        acpi_os_printf ("= %8.8X%8.8X\n",
-                               ACPI_FORMAT_UINT64 (obj_desc->integer.value));
+                                        ACPI_FORMAT_UINT64 (obj_desc->integer.value));
                        break;
 
 
@@ -257,7 +258,7 @@ acpi_ns_dump_one_object (
 
                        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
                                acpi_os_printf ("Elements %.2X\n",
-                                       obj_desc->package.count);
+                                                obj_desc->package.count);
                        }
                        else {
                                acpi_os_printf ("[Length not yet evaluated]\n");
@@ -297,12 +298,11 @@ acpi_ns_dump_one_object (
 
                case ACPI_TYPE_REGION:
 
-                       acpi_os_printf ("[%s]",
-                               acpi_ut_get_region_name (obj_desc->region.space_id));
+                       acpi_os_printf ("[%s]", acpi_ut_get_region_name (obj_desc->region.space_id));
                        if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
                                acpi_os_printf (" Addr %8.8X%8.8X Len %.4X\n",
-                                       ACPI_FORMAT_UINT64 (obj_desc->region.address),
-                                       obj_desc->region.length);
+                                                ACPI_FORMAT_UINT64 (obj_desc->region.address),
+                                                obj_desc->region.length);
                        }
                        else {
                                acpi_os_printf (" [Address/Length not yet evaluated]\n");
@@ -313,7 +313,7 @@ acpi_ns_dump_one_object (
                case ACPI_TYPE_LOCAL_REFERENCE:
 
                        acpi_os_printf ("[%s]\n",
-                               acpi_ps_get_opcode_name (obj_desc->reference.opcode));
+                                       acpi_ps_get_opcode_name (obj_desc->reference.opcode));
                        break;
 
 
@@ -322,7 +322,7 @@ acpi_ns_dump_one_object (
                        if (obj_desc->buffer_field.buffer_obj &&
                                obj_desc->buffer_field.buffer_obj->buffer.node) {
                                acpi_os_printf ("Buf [%4.4s]",
-                                       acpi_ut_get_node_name (obj_desc->buffer_field.buffer_obj->buffer.node));
+                                               acpi_ut_get_node_name (obj_desc->buffer_field.buffer_obj->buffer.node));
                        }
                        break;
 
@@ -330,31 +330,30 @@ acpi_ns_dump_one_object (
                case ACPI_TYPE_LOCAL_REGION_FIELD:
 
                        acpi_os_printf ("Rgn [%4.4s]",
-                               acpi_ut_get_node_name (obj_desc->common_field.region_obj->region.node));
+                                       acpi_ut_get_node_name (obj_desc->common_field.region_obj->region.node));
                        break;
 
 
                case ACPI_TYPE_LOCAL_BANK_FIELD:
 
                        acpi_os_printf ("Rgn [%4.4s] Bnk [%4.4s]",
-                               acpi_ut_get_node_name (obj_desc->common_field.region_obj->region.node),
-                               acpi_ut_get_node_name (obj_desc->bank_field.bank_obj->common_field.node));
+                                       acpi_ut_get_node_name (obj_desc->common_field.region_obj->region.node),
+                                       acpi_ut_get_node_name (obj_desc->bank_field.bank_obj->common_field.node));
                        break;
 
 
                case ACPI_TYPE_LOCAL_INDEX_FIELD:
 
                        acpi_os_printf ("Idx [%4.4s] Dat [%4.4s]",
-                               acpi_ut_get_node_name (obj_desc->index_field.index_obj->common_field.node),
-                               acpi_ut_get_node_name (obj_desc->index_field.data_obj->common_field.node));
+                                       acpi_ut_get_node_name (obj_desc->index_field.index_obj->common_field.node),
+                                       acpi_ut_get_node_name (obj_desc->index_field.data_obj->common_field.node));
                        break;
 
 
                case ACPI_TYPE_LOCAL_ALIAS:
                case ACPI_TYPE_LOCAL_METHOD_ALIAS:
 
-                       acpi_os_printf ("Target %4.4s (%p)\n",
-                               acpi_ut_get_node_name (obj_desc), obj_desc);
+                       acpi_os_printf ("Target %4.4s (%p)\n", acpi_ut_get_node_name (obj_desc), obj_desc);
                        break;
 
                default:
@@ -372,10 +371,10 @@ acpi_ns_dump_one_object (
                case ACPI_TYPE_LOCAL_INDEX_FIELD:
 
                        acpi_os_printf (" Off %.3X Len %.2X Acc %.2hd\n",
-                               (obj_desc->common_field.base_byte_offset * 8)
-                                       + obj_desc->common_field.start_field_bit_offset,
-                               obj_desc->common_field.bit_length,
-                               obj_desc->common_field.access_byte_width);
+                                       (obj_desc->common_field.base_byte_offset * 8)
+                                               + obj_desc->common_field.start_field_bit_offset,
+                                       obj_desc->common_field.bit_length,
+                                       obj_desc->common_field.access_byte_width);
                        break;
 
                default:
@@ -472,13 +471,12 @@ acpi_ns_dump_one_object (
                        obj_type = ACPI_GET_OBJECT_TYPE (obj_desc);
 
                        if (obj_type > ACPI_TYPE_LOCAL_MAX) {
-                               acpi_os_printf ("(Ptr to ACPI Object type %X [UNKNOWN])\n",
-                                       obj_type);
+                               acpi_os_printf ("(Ptr to ACPI Object type %X [UNKNOWN])\n", obj_type);
                                bytes_to_dump = 32;
                        }
                        else {
                                acpi_os_printf ("(Ptr to ACPI Object type %s, %X)\n",
-                                       acpi_ut_get_type_name (obj_type), obj_type);
+                                                  acpi_ut_get_type_name (obj_type), obj_type);
                                bytes_to_dump = sizeof (union acpi_operand_object);
                        }
                        break;
@@ -486,9 +484,8 @@ acpi_ns_dump_one_object (
 
                default:
 
-                       acpi_os_printf (
-                               "(String or Buffer ptr - not an object descriptor) [%s]\n",
-                               acpi_ut_get_descriptor_name (obj_desc));
+                       acpi_os_printf ("(String or Buffer ptr - not an object descriptor) [%s]\n",
+                                       acpi_ut_get_descriptor_name (obj_desc));
                        bytes_to_dump = 16;
                        break;
                }
@@ -550,14 +547,12 @@ cleanup:
 }
 
 
-#ifdef ACPI_FUTURE_USAGE
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_dump_objects
  *
  * PARAMETERS:  Type                - Object type to be dumped
- *              max_depth           - Maximum depth of dump. Use ACPI_UINT32_MAX
+ *              max_depth           - Maximum depth of dump.  Use ACPI_UINT32_MAX
  *                                    for an effectively unlimited depth.
  *              owner_id            - Dump only objects owned by this ID.  Use
  *                                    ACPI_UINT32_MAX to match all owners.
@@ -637,8 +632,6 @@ acpi_ns_dump_tables (
        return_VOID;
 }
 
-#endif  /*  ACPI_FUTURE_USAGE  */
-
 
 /*******************************************************************************
  *