ACPICA: Cosmetic changes only, no functional changes

Lint changes, fix compiler warnings, etc.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>

5 files changed, 28 insertions, 32 deletions

diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 3db651c7f582..7a99740248c7 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -42,7 +42,6 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
@@ -102,7 +101,7 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)
                                                     walk_state->opcode,
                                                     walk_state->aml_offset,
                                                     NULL);
-                (void)acpi_ex_enter_interpreter();
+                acpi_ex_enter_interpreter();
         }
 #ifdef ACPI_DISASSEMBLER
         if (ACPI_FAILURE(status)) {
@@ -535,7 +534,6 @@ void
 acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                                  struct acpi_walk_state *walk_state)
 {
-        acpi_status status;
 
         ACPI_FUNCTION_TRACE_PTR(ds_terminate_control_method, walk_state);
 
@@ -550,29 +548,27 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                 /* Delete all arguments and locals */
 
                 acpi_ds_method_data_delete_all(walk_state);
-        }
 
-        /*
-         * If method is serialized, release the mutex and restore the
-         * current sync level for this thread
-         */
-        if (method_desc->method.mutex) {
+                /*
+                 * If method is serialized, release the mutex and restore the
+                 * current sync level for this thread
+                 */
+                if (method_desc->method.mutex) {
 
-                /* Acquisition Depth handles recursive calls */
+                        /* Acquisition Depth handles recursive calls */
 
-                method_desc->method.mutex->mutex.acquisition_depth--;
-                if (!method_desc->method.mutex->mutex.acquisition_depth) {
-                        walk_state->thread->current_sync_level =
-                            method_desc->method.mutex->mutex.
-                            original_sync_level;
+                        method_desc->method.mutex->mutex.acquisition_depth--;
+                        if (!method_desc->method.mutex->mutex.acquisition_depth) {
+                                walk_state->thread->current_sync_level =
+                                    method_desc->method.mutex->mutex.
+                                    original_sync_level;
 
-                        acpi_os_release_mutex(method_desc->method.mutex->mutex.
-                                              os_mutex);
-                        method_desc->method.mutex->mutex.thread_id = 0;
+                                acpi_os_release_mutex(method_desc->method.
+                                                      mutex->mutex.os_mutex);
+                                method_desc->method.mutex->mutex.thread_id = 0;
+                        }
                 }
-        }
 
-        if (walk_state) {
                 /*
                  * Delete any namespace objects created anywhere within
                  * the namespace by the execution of this method
@@ -613,7 +609,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                  */
                 if ((method_desc->method.method_flags & AML_METHOD_SERIALIZED)
                     && (!method_desc->method.mutex)) {
-                        status = acpi_ds_create_method_mutex(method_desc);
+                        (void)acpi_ds_create_method_mutex(method_desc);
                 }
 
                 /* No more threads, we can free the owner_id */
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 7556d919bf8b..58d4d91c8e97 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -157,7 +157,9 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                          * will remain as named references. This behavior is not described
                          * in the ACPI spec, but it appears to be an oversight.
                          */
-                        obj_desc = (union acpi_operand_object *)op->common.node;
+                        obj_desc =
+                            ACPI_CAST_PTR(union acpi_operand_object,
+                                          op->common.node);
 
                         status =
                             acpi_ex_resolve_node_to_value(ACPI_CAST_INDIRECT_PTR
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 0c4630dc09f3..f0847eed5f3a 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -770,7 +770,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",
                           obj_desc,
-                          ACPI_FORMAT_UINT64(obj_desc->region.address),
+                          ACPI_FORMAT_NATIVE_UINT(obj_desc->region.address),
                           obj_desc->region.length));
 
         /* Now the address and length are valid for this opregion */
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 36518b4a79c2..97d01dcdc972 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -700,10 +700,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 +733,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,
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 698d2e1c219e..4c402be3c74a 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -220,7 +220,7 @@ static acpi_status acpi_ds_result_stack_push(struct acpi_walk_state *walk_state)
 
         /* Check for stack overflow */
 
-        if ((walk_state->result_size + ACPI_RESULTS_FRAME_OBJ_NUM) >
+        if (((u32) walk_state->result_size + ACPI_RESULTS_FRAME_OBJ_NUM) >
             ACPI_RESULTS_OBJ_NUM_MAX) {
                 ACPI_ERROR((AE_INFO, "Result stack overflow: State=%p Num=%X",
                             walk_state, walk_state->result_size));
@@ -400,7 +400,7 @@ void
 acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
                                  struct acpi_walk_state *walk_state)
 {
-        u32 i;
+        acpi_native_int 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 = (pop_count - 1); i >= 0; i--) {
+        for (i = (acpi_native_int) (pop_count - 1); i >= 0; i--) {
                 if (walk_state->num_operands == 0) {
                         return;
                 }