Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7f9f042 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Cosmetic changes only, no functional changes 



Lint changes, fix compiler warnings, etc.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1d18c058

drivers/acpi/dispatcher/dsmethod.c

+17 −21
Original line number Diff line number Diff line
@@ -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,7 +548,6 @@ 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
@@ -566,13 +563,12 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc, 
				    method_desc->method.mutex->mutex.

				    original_sync_level;



			acpi_os_release_mutex(method_desc->method.mutex->mutex.

					      os_mutex);

				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 */

drivers/acpi/dispatcher/dsobject.c

+3 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/dispatcher/dsopcode.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/acpi/dispatcher/dsutils.c

+4 −6
Original line number Diff line number Diff line
@@ -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,

drivers/acpi/dispatcher/dswstate.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

		}