Patched in Tegra support.

author: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
committer: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
commit: 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree: a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/acpi/acpica/dswstate.c
parent: 406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
1 files changed, 22 insertions, 26 deletions
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index 3e65a15a735..a6c374ef991 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -51,15 +51,14 @@
 ACPI_MODULE_NAME("dswstate")
  /* Local prototypes */
-static acpi_status
+static acpi_status acpi_ds_result_stack_push(struct acpi_walk_state *ws);
-acpi_ds_result_stack_push(struct acpi_walk_state *walk_state);
+static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *ws);
-static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *walk_state);
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ds_result_pop
 *
- * PARAMETERS:  object              - Where to return the popped object
+ * PARAMETERS:  Object              - Where to return the popped object
 *              walk_state          - Current Walk state
 *
 * RETURN:      Status
@@ -133,7 +132,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
 *
 * FUNCTION:    acpi_ds_result_push
 *
- * PARAMETERS:  object              - Where to return the popped object
+ * PARAMETERS:  Object              - Where to return the popped object
 *              walk_state          - Current Walk state
 *
 * RETURN:      Status
@@ -297,7 +296,7 @@ static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *walk_state)
 *
 * FUNCTION:    acpi_ds_obj_stack_push
 *
- * PARAMETERS:  object              - Object to push
+ * PARAMETERS:  Object              - Object to push
 *              walk_state          - Current Walk state
 *
 * RETURN:      Status
@@ -348,7 +347,7 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Pop this walk's object stack. Objects on the stack are NOT
+ * DESCRIPTION: Pop this walk's object stack.  Objects on the stack are NOT
 *              deleted by this routine.
 *
 ******************************************************************************/
@@ -434,7 +433,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
 *
 * FUNCTION:    acpi_ds_get_current_walk_state
 *
- * PARAMETERS:  thread          - Get current active state for this Thread
+ * PARAMETERS:  Thread          - Get current active state for this Thread
 *
 * RETURN:      Pointer to the current walk state
 *
@@ -463,7 +462,7 @@ struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
 * FUNCTION:    acpi_ds_push_walk_state
 *
 * PARAMETERS:  walk_state      - State to push
- *              thread          - Thread state object
+ *              Thread          - Thread state object
 *
 * RETURN:      None
 *
@@ -487,12 +486,12 @@ acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
 *
 * FUNCTION:    acpi_ds_pop_walk_state
 *
- * PARAMETERS:  thread      - Current thread state
+ * PARAMETERS:  Thread      - Current thread state
 *
 * RETURN:      A walk_state object popped from the thread's stack
 *
 * DESCRIPTION: Remove and return the walkstate object that is at the head of
- *              the walk stack for the given walk list. NULL indicates that
+ *              the walk stack for the given walk list.  NULL indicates that
 *              the list is empty.
 *
 ******************************************************************************/
@@ -526,23 +525,20 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
 * FUNCTION:    acpi_ds_create_walk_state
 *
 * PARAMETERS:  owner_id        - ID for object creation
- *              origin          - Starting point for this walk
+ *              Origin          - Starting point for this walk
 *              method_desc     - Method object
- *              thread          - Current thread state
+ *              Thread          - Current thread state
 *
 * RETURN:      Pointer to the new walk state.
 *
- * DESCRIPTION: Allocate and initialize a new walk state. The current walk
+ * DESCRIPTION: Allocate and initialize a new walk state.  The current walk
 *              state is set to this new state.
 *
 ******************************************************************************/
-struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
-                                                  union acpi_parse_object
+                                                  *origin, union acpi_operand_object
-                                                  *origin,
+                                                  *method_desc, struct acpi_thread_state
-                                                  union acpi_operand_object
-                                                  *method_desc,
-                                                  struct acpi_thread_state
                                                  *thread)
 {
        struct acpi_walk_state *walk_state;
@@ -582,11 +578,11 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
 * FUNCTION:    acpi_ds_init_aml_walk
 *
 * PARAMETERS:  walk_state      - New state to be initialized
- *              op              - Current parse op
+ *              Op              - Current parse op
 *              method_node     - Control method NS node, if any
 *              aml_start       - Start of AML
 *              aml_length      - Length of AML
- *              info            - Method info block (params, etc.)
+ *              Info            - Method info block (params, etc.)
 *              pass_number     - 1, 2, or 3
 *
 * RETURN:      Status
@@ -657,7 +653,7 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
                /*
                 * Setup the current scope.
                 * Find a Named Op that has a namespace node associated with it.
-                 * search upwards from this Op. Current scope is the first
+                 * search upwards from this Op.  Current scope is the first
                 * Op with a namespace node.
                 */
                extra_op = parser_state->start_op;
@@ -708,13 +704,13 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
        ACPI_FUNCTION_TRACE_PTR(ds_delete_walk_state, walk_state);
        if (!walk_state) {
-                return_VOID;
+                return;
        }
        if (walk_state->descriptor_type != ACPI_DESC_TYPE_WALK) {
                ACPI_ERROR((AE_INFO, "%p is not a valid walk state",
                            walk_state));
-                return_VOID;
+                return;
        }
        /* There should not be any open scopes */
author	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
committer	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
commit	8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree	a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/acpi/acpica/dswstate.c
parent	406089d01562f1e2bf9f089fd7637009ebaad589 (diff)