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 / parser / psscope.c
index dcbed49..bc6047c 100644 (file)
@@ -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
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acparser.h>
 
 #define _COMPONENT          ACPI_PARSER
-        ACPI_MODULE_NAME    ("psscope")
-
+ACPI_MODULE_NAME("psscope")
 
 /*******************************************************************************
  *
  * DESCRIPTION: Get parent of current op being parsed
  *
  ******************************************************************************/
-
-union acpi_parse_object *
-acpi_ps_get_parent_scope (
-       struct acpi_parse_state         *parser_state)
+union acpi_parse_object *acpi_ps_get_parent_scope(struct acpi_parse_state
+                                                 *parser_state)
 {
+
        return (parser_state->scope->parse_scope.op);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ps_has_completed_scope
@@ -83,14 +79,13 @@ acpi_ps_get_parent_scope (
  *
  ******************************************************************************/
 
-u8
-acpi_ps_has_completed_scope (
-       struct acpi_parse_state         *parser_state)
+u8 acpi_ps_has_completed_scope(struct acpi_parse_state * parser_state)
 {
-       return ((u8) ((parser_state->aml >= parser_state->scope->parse_scope.arg_end ||
-                          !parser_state->scope->parse_scope.arg_count)));
-}
 
+       return ((u8)
+               ((parser_state->aml >= parser_state->scope->parse_scope.arg_end
+                 || !parser_state->scope->parse_scope.arg_count)));
+}
 
 /*******************************************************************************
  *
@@ -106,34 +101,30 @@ acpi_ps_has_completed_scope (
  ******************************************************************************/
 
 acpi_status
-acpi_ps_init_scope (
-       struct acpi_parse_state         *parser_state,
-       union acpi_parse_object         *root_op)
+acpi_ps_init_scope(struct acpi_parse_state * parser_state,
+                  union acpi_parse_object * root_op)
 {
-       union acpi_generic_state        *scope;
-
-
-       ACPI_FUNCTION_TRACE_PTR ("ps_init_scope", root_op);
+       union acpi_generic_state *scope;
 
+       ACPI_FUNCTION_TRACE_PTR("ps_init_scope", root_op);
 
-       scope = acpi_ut_create_generic_state ();
+       scope = acpi_ut_create_generic_state();
        if (!scope) {
-               return_ACPI_STATUS (AE_NO_MEMORY);
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
-       scope->common.data_type     = ACPI_DESC_TYPE_STATE_RPSCOPE;
-       scope->parse_scope.op       = root_op;
+       scope->common.data_type = ACPI_DESC_TYPE_STATE_RPSCOPE;
+       scope->parse_scope.op = root_op;
        scope->parse_scope.arg_count = ACPI_VAR_ARGS;
-       scope->parse_scope.arg_end  = parser_state->aml_end;
-       scope->parse_scope.pkg_end  = parser_state->aml_end;
+       scope->parse_scope.arg_end = parser_state->aml_end;
+       scope->parse_scope.pkg_end = parser_state->aml_end;
 
-       parser_state->scope         = scope;
-       parser_state->start_op      = root_op;
+       parser_state->scope = scope;
+       parser_state->start_op = root_op;
 
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ps_push_scope
@@ -150,48 +141,42 @@ acpi_ps_init_scope (
  ******************************************************************************/
 
 acpi_status
-acpi_ps_push_scope (
-       struct acpi_parse_state         *parser_state,
-       union acpi_parse_object         *op,
-       u32                             remaining_args,
-       u32                             arg_count)
+acpi_ps_push_scope(struct acpi_parse_state *parser_state,
+                  union acpi_parse_object *op,
+                  u32 remaining_args, u32 arg_count)
 {
-       union acpi_generic_state        *scope;
-
+       union acpi_generic_state *scope;
 
-       ACPI_FUNCTION_TRACE_PTR ("ps_push_scope", op);
+       ACPI_FUNCTION_TRACE_PTR("ps_push_scope", op);
 
-
-       scope = acpi_ut_create_generic_state ();
+       scope = acpi_ut_create_generic_state();
        if (!scope) {
-               return_ACPI_STATUS (AE_NO_MEMORY);
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
-       scope->common.data_type        = ACPI_DESC_TYPE_STATE_PSCOPE;
-       scope->parse_scope.op          = op;
-       scope->parse_scope.arg_list    = remaining_args;
-       scope->parse_scope.arg_count   = arg_count;
-       scope->parse_scope.pkg_end     = parser_state->pkg_end;
+       scope->common.data_type = ACPI_DESC_TYPE_STATE_PSCOPE;
+       scope->parse_scope.op = op;
+       scope->parse_scope.arg_list = remaining_args;
+       scope->parse_scope.arg_count = arg_count;
+       scope->parse_scope.pkg_end = parser_state->pkg_end;
 
        /* Push onto scope stack */
 
-       acpi_ut_push_generic_state (&parser_state->scope, scope);
+       acpi_ut_push_generic_state(&parser_state->scope, scope);
 
        if (arg_count == ACPI_VAR_ARGS) {
-               /* multiple arguments */
+               /* Multiple arguments */
 
                scope->parse_scope.arg_end = parser_state->pkg_end;
-       }
-       else {
-               /* single argument */
+       } else {
+               /* Single argument */
 
-               scope->parse_scope.arg_end = ACPI_TO_POINTER (ACPI_MAX_PTR);
+               scope->parse_scope.arg_end = ACPI_TO_POINTER(ACPI_MAX_PTR);
        }
 
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ps_pop_scope
@@ -209,70 +194,59 @@ acpi_ps_push_scope (
  ******************************************************************************/
 
 void
-acpi_ps_pop_scope (
-       struct acpi_parse_state         *parser_state,
-       union acpi_parse_object         **op,
-       u32                             *arg_list,
-       u32                             *arg_count)
+acpi_ps_pop_scope(struct acpi_parse_state *parser_state,
+                 union acpi_parse_object **op, u32 * arg_list, u32 * arg_count)
 {
-       union acpi_generic_state        *scope = parser_state->scope;
+       union acpi_generic_state *scope = parser_state->scope;
 
+       ACPI_FUNCTION_TRACE("ps_pop_scope");
 
-       ACPI_FUNCTION_TRACE ("ps_pop_scope");
+       /* Only pop the scope if there is in fact a next scope */
 
-
-       /*
-        * Only pop the scope if there is in fact a next scope
-        */
        if (scope->common.next) {
-               scope = acpi_ut_pop_generic_state (&parser_state->scope);
+               scope = acpi_ut_pop_generic_state(&parser_state->scope);
 
                /* return to parsing previous op */
 
-               *op                     = scope->parse_scope.op;
-               *arg_list               = scope->parse_scope.arg_list;
-               *arg_count              = scope->parse_scope.arg_count;
-               parser_state->pkg_end   = scope->parse_scope.pkg_end;
+               *op = scope->parse_scope.op;
+               *arg_list = scope->parse_scope.arg_list;
+               *arg_count = scope->parse_scope.arg_count;
+               parser_state->pkg_end = scope->parse_scope.pkg_end;
 
                /* All done with this scope state structure */
 
-               acpi_ut_delete_generic_state (scope);
-       }
-       else {
+               acpi_ut_delete_generic_state(scope);
+       } else {
                /* empty parse stack, prepare to fetch next opcode */
 
-               *op                     = NULL;
-               *arg_list               = 0;
-               *arg_count              = 0;
+               *op = NULL;
+               *arg_list = 0;
+               *arg_count = 0;
        }
 
-       ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Popped Op %p Args %X\n", *op, *arg_count));
+       ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                         "Popped Op %p Args %X\n", *op, *arg_count));
        return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ps_cleanup_scope
  *
  * PARAMETERS:  parser_state        - Current parser state object
  *
- * RETURN:      Status
+ * RETURN:      None
  *
  * DESCRIPTION: Destroy available list, remaining stack levels, and return
  *              root scope
  *
  ******************************************************************************/
 
-void
-acpi_ps_cleanup_scope (
-       struct acpi_parse_state         *parser_state)
+void acpi_ps_cleanup_scope(struct acpi_parse_state *parser_state)
 {
-       union acpi_generic_state        *scope;
-
-
-       ACPI_FUNCTION_TRACE_PTR ("ps_cleanup_scope", parser_state);
+       union acpi_generic_state *scope;
 
+       ACPI_FUNCTION_TRACE_PTR("ps_cleanup_scope", parser_state);
 
        if (!parser_state) {
                return_VOID;
@@ -281,10 +255,9 @@ acpi_ps_cleanup_scope (
        /* Delete anything on the scope stack */
 
        while (parser_state->scope) {
-               scope = acpi_ut_pop_generic_state (&parser_state->scope);
-               acpi_ut_delete_generic_state (scope);
+               scope = acpi_ut_pop_generic_state(&parser_state->scope);
+               acpi_ut_delete_generic_state(scope);
        }
 
        return_VOID;
 }
-