5 files changed, 11 insertions, 42 deletions

diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index 610b1ee102b0..949f7c75029e 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -151,7 +151,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
  ******************************************************************************/
 
 acpi_status
-acpi_ds_initialize_objects(acpi_native_uint table_index,
+acpi_ds_initialize_objects(u32 table_index,
                            struct acpi_namespace_node * start_node)
 {
         acpi_status status;
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 2509809a36cf..4613b9ca5792 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -377,7 +377,6 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
         }
 
         info->parameters = &this_walk_state->operands[0];
-        info->parameter_type = ACPI_PARAM_ARGS;
 
         status = acpi_ds_init_aml_walk(next_walk_state, NULL, method_node,
                                        obj_desc->method.aml_start,
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index a818e0ddb996..6a81c4400edf 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -691,12 +691,6 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
 
         status = acpi_ex_resolve_operands(op->common.aml_opcode,
                                           ACPI_WALK_OPERANDS, walk_state);
-
-        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-                           acpi_ps_get_opcode_name(op->common.aml_opcode),
-                           walk_state->num_operands,
-                           "after AcpiExResolveOperands");
-
         if (ACPI_FAILURE(status)) {
                 ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",
                             acpi_ps_get_opcode_name(op->common.aml_opcode),
@@ -785,10 +779,6 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
                 return_ACPI_STATUS(status);
         }
 
-        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-                           acpi_ps_get_opcode_name(op->common.aml_opcode),
-                           1, "after AcpiExResolveOperands");
-
         obj_desc = acpi_ns_get_attached_object(node);
         if (!obj_desc) {
                 return_ACPI_STATUS(AE_NOT_EXIST);
@@ -848,7 +838,7 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
         union acpi_operand_object **operand;
         struct acpi_namespace_node *node;
         union acpi_parse_object *next_op;
-        acpi_native_uint table_index;
+        u32 table_index;
         struct acpi_table_header *table;
 
         ACPI_FUNCTION_TRACE_PTR(ds_eval_table_region_operands, op);
@@ -882,10 +872,6 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
                 return_ACPI_STATUS(status);
         }
 
-        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-                           acpi_ps_get_opcode_name(op->common.aml_opcode),
-                           1, "after AcpiExResolveOperands");
-
         operand = &walk_state->operands[0];
 
         /* Find the ACPI table */
@@ -1091,10 +1077,8 @@ acpi_ds_eval_bank_field_operands(struct acpi_walk_state *walk_state,
                 return_ACPI_STATUS(status);
         }
 
-        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-                           acpi_ps_get_opcode_name(op->common.aml_opcode),
-                           1, "after AcpiExResolveOperands");
-
+        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS,
+                           acpi_ps_get_opcode_name(op->common.aml_opcode), 1);
         /*
          * Get the bank_value operand and save it
          * (at Top of stack)
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index b246b9657ead..b5072fa9c920 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -408,14 +408,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                                                             [walk_state->
                                                              num_operands - 1]),
                                                           walk_state);
-                        if (ACPI_SUCCESS(status)) {
-                                ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS,
-                                                   ACPI_IMODE_EXECUTE,
-                                                   acpi_ps_get_opcode_name
-                                                   (walk_state->opcode),
-                                                   walk_state->num_operands,
-                                                   "after ExResolveOperands");
-                        }
                 }
 
                 if (ACPI_SUCCESS(status)) {
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 1386ced332ec..b00d4af791aa 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -70,7 +70,7 @@ acpi_status
 acpi_ds_result_pop(union acpi_operand_object **object,
                    struct acpi_walk_state *walk_state)
 {
-        acpi_native_uint index;
+        u32 index;
         union acpi_generic_state *state;
         acpi_status status;
 
@@ -122,7 +122,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                           "Obj=%p [%s] Index=%X State=%p Num=%X\n", *object,
                           acpi_ut_get_object_type_name(*object),
-                          (u32) index, walk_state, walk_state->result_count));
+                          index, walk_state, walk_state->result_count));
 
         return (AE_OK);
 }
@@ -146,7 +146,7 @@ acpi_ds_result_push(union acpi_operand_object * object,
 {
         union acpi_generic_state *state;
         acpi_status status;
-        acpi_native_uint index;
+        u32 index;
 
         ACPI_FUNCTION_NAME(ds_result_push);
 
@@ -400,7 +400,7 @@ void
 acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
                                  struct acpi_walk_state *walk_state)
 {
-        acpi_native_int i;
+        s32 i;
         union acpi_operand_object *obj_desc;
 
         ACPI_FUNCTION_NAME(ds_obj_stack_pop_and_delete);
@@ -409,7 +409,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
                 return;
         }
 
-        for (i = (acpi_native_int) (pop_count - 1); i >= 0; i--) {
+        for (i = (s32) pop_count - 1; i >= 0; i--) {
                 if (walk_state->num_operands == 0) {
                         return;
                 }
@@ -615,14 +615,8 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
         walk_state->pass_number = pass_number;
 
         if (info) {
-                if (info->parameter_type == ACPI_PARAM_GPE) {
-                        walk_state->gpe_event_info =
-                            ACPI_CAST_PTR(struct acpi_gpe_event_info,
-                                          info->parameters);
-                } else {
-                        walk_state->params = info->parameters;
-                        walk_state->caller_return_desc = &info->return_object;
-                }
+                walk_state->params = info->parameters;
+                walk_state->caller_return_desc = &info->return_object;
         }
 
         status = acpi_ps_init_scope(&walk_state->parser_state, op);