Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index a0e13e8..232be43 100644 (file)
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -5,7 +5,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
@@ -41,16 +41,13 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acparser.h>
 #include <acpi/acdispat.h>
 
-
 #define _COMPONENT          ACPI_NAMESPACE
-        ACPI_MODULE_NAME    ("nsparse")
-
+ACPI_MODULE_NAME("nsparse")
 
 /*******************************************************************************
  *
@@ -64,54 +61,50 @@
  * DESCRIPTION: Perform one complete parse of an ACPI/AML table.
  *
  ******************************************************************************/
-
 acpi_status
-acpi_ns_one_complete_parse (
-       u32                             pass_number,
-       struct acpi_table_desc          *table_desc)
+acpi_ns_one_complete_parse(u8 pass_number, struct acpi_table_desc * table_desc)
 {
-       union acpi_parse_object         *parse_root;
-       acpi_status                     status;
-       struct acpi_walk_state          *walk_state;
-
-
-       ACPI_FUNCTION_TRACE ("ns_one_complete_parse");
+       union acpi_parse_object *parse_root;
+       acpi_status status;
+       struct acpi_walk_state *walk_state;
 
+       ACPI_FUNCTION_TRACE("ns_one_complete_parse");
 
        /* Create and init a Root Node */
 
-       parse_root = acpi_ps_create_scope_op ();
+       parse_root = acpi_ps_create_scope_op();
        if (!parse_root) {
-               return_ACPI_STATUS (AE_NO_MEMORY);
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
        /* Create and initialize a new walk state */
 
-       walk_state = acpi_ds_create_walk_state (table_desc->table_id,
-                          NULL, NULL, NULL);
+       walk_state = acpi_ds_create_walk_state(table_desc->owner_id,
+                                              NULL, NULL, NULL);
        if (!walk_state) {
-               acpi_ps_free_op (parse_root);
-               return_ACPI_STATUS (AE_NO_MEMORY);
+               acpi_ps_free_op(parse_root);
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
-       status = acpi_ds_init_aml_walk (walk_state, parse_root, NULL,
-                         table_desc->aml_start, table_desc->aml_length,
-                         NULL, pass_number);
-       if (ACPI_FAILURE (status)) {
-               acpi_ds_delete_walk_state (walk_state);
-               return_ACPI_STATUS (status);
+       status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
+                                      table_desc->aml_start,
+                                      table_desc->aml_length, NULL,
+                                      pass_number);
+       if (ACPI_FAILURE(status)) {
+               acpi_ds_delete_walk_state(walk_state);
+               return_ACPI_STATUS(status);
        }
 
        /* Parse the AML */
 
-       ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "*PARSE* pass %d parse\n", pass_number));
-       status = acpi_ps_parse_aml (walk_state);
+       ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "*PARSE* pass %d parse\n",
+                         pass_number));
+       status = acpi_ps_parse_aml(walk_state);
 
-       acpi_ps_delete_parse_tree (parse_root);
-       return_ACPI_STATUS (status);
+       acpi_ps_delete_parse_tree(parse_root);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_parse_table
@@ -126,15 +119,12 @@ acpi_ns_one_complete_parse (
  ******************************************************************************/
 
 acpi_status
-acpi_ns_parse_table (
-       struct acpi_table_desc          *table_desc,
-       struct acpi_namespace_node      *start_node)
+acpi_ns_parse_table(struct acpi_table_desc *table_desc,
+                   struct acpi_namespace_node *start_node)
 {
-       acpi_status                     status;
-
-
-       ACPI_FUNCTION_TRACE ("ns_parse_table");
+       acpi_status status;
 
+       ACPI_FUNCTION_TRACE("ns_parse_table");
 
        /*
         * AML Parse, pass 1
@@ -146,9 +136,10 @@ acpi_ns_parse_table (
         * to service the entire parse.  The second pass of the parse then
         * performs another complete parse of the AML..
         */
-       status = acpi_ns_one_complete_parse (1, table_desc);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 1\n"));
+       status = acpi_ns_one_complete_parse(1, table_desc);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
        /*
@@ -160,12 +151,11 @@ acpi_ns_parse_table (
         * overhead of this is compensated for by the fact that the
         * parse objects are all cached.
         */
-       status = acpi_ns_one_complete_parse (2, table_desc);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 2\n"));
+       status = acpi_ns_one_complete_parse(2, table_desc);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-
-