ACPICA: Restructure includes into public/private

[deliverable/linux.git] / drivers / acpi / dispatcher / dsutils.c

diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 36518b4a79c26fe434685d9a06c8617c308e3f5f..9c88846ca2cee58d493d58bcd6ac31e32e681d16 100644 (file)
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
  */
 
 #include <acpi/acpi.h>
+#include <acpi/accommon.h>
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
@@ -278,7 +279,9 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                        AML_VAR_PACKAGE_OP)
                    || (op->common.parent->common.aml_opcode == AML_BUFFER_OP)
                    || (op->common.parent->common.aml_opcode ==
-                       AML_INT_EVAL_SUBTREE_OP)) {
+                       AML_INT_EVAL_SUBTREE_OP)
+                   || (op->common.parent->common.aml_opcode ==
+                       AML_BANK_FIELD_OP)) {
                        /*
                         * These opcodes allow term_arg(s) as operands and therefore
                         * the operands can be method calls.  The result is used.
@@ -700,10 +703,9 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
        acpi_status status = AE_OK;
        union acpi_parse_object *arg;
        union acpi_parse_object *arguments[ACPI_OBJ_NUM_OPERANDS];
-       u8 arg_count = 0;
-       u8 count = 0;
-       u8 index = walk_state->num_operands;
-       u8 i;
+       u32 arg_count = 0;
+       u32 index = walk_state->num_operands;
+       u32 i;
 
        ACPI_FUNCTION_TRACE_PTR(ds_create_operands, first_arg);
 
@@ -734,14 +736,13 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
 
                /* Force the filling of the operand stack in inverse order */
 
-               walk_state->operand_index = index;
+               walk_state->operand_index = (u8) index;
 
                status = acpi_ds_create_operand(walk_state, arg, index);
                if (ACPI_FAILURE(status)) {
                        goto cleanup;
                }
 
-               count++;
                index--;
 
                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,