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

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

ACPICA: Fix miscellaneous warnings under gcc 4+ 



Some possible warnings with gcc 4+, especially with extended warnings
enabled

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e4c1ebfc

drivers/acpi/acpica/dsobject.c

+3 −2
Original line number Diff line number Diff line
@@ -734,7 +734,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 


			/* Local ID (0-7) is (AML opcode - base AML_LOCAL_OP) */



			obj_desc->reference.value = opcode - AML_LOCAL_OP;

			obj_desc->reference.value =

			    ((u32)opcode) - AML_LOCAL_OP;

			obj_desc->reference.class = ACPI_REFCLASS_LOCAL;



#ifndef ACPI_NO_METHOD_EXECUTION
@@ -754,7 +755,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 


			/* Arg ID (0-6) is (AML opcode - base AML_ARG_OP) */



			obj_desc->reference.value = opcode - AML_ARG_OP;

			obj_desc->reference.value = ((u32)opcode) - AML_ARG_OP;

			obj_desc->reference.class = ACPI_REFCLASS_ARG;



#ifndef ACPI_NO_METHOD_EXECUTION

drivers/acpi/acpica/dswstate.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ acpi_ds_result_pop(union acpi_operand_object **object, 
	/* Return object of the top element and clean that top element result stack */



	walk_state->result_count--;

	index = walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;

	index = (u32)walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;



	*object = state->results.obj_desc[index];

	if (!*object) {
@@ -186,7 +186,7 @@ acpi_ds_result_push(union acpi_operand_object * object, 


	/* Assign the address of object to the top free element of result stack */



	index = walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;

	index = (u32)walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;

	state->results.obj_desc[index] = object;

	walk_state->result_count++;

drivers/acpi/acpica/rsxface.c

+6 −2
Original line number Diff line number Diff line
@@ -338,13 +338,17 @@ acpi_resource_to_address64(struct acpi_resource *resource, 
	switch (resource->type) {

	case ACPI_RESOURCE_TYPE_ADDRESS16:



		address16 = (struct acpi_resource_address16 *)&resource->data;

		address16 =

		    ACPI_CAST_PTR(struct acpi_resource_address16,

				  &resource->data);

		ACPI_COPY_ADDRESS(out, address16);

		break;



	case ACPI_RESOURCE_TYPE_ADDRESS32:



		address32 = (struct acpi_resource_address32 *)&resource->data;

		address32 =

		    ACPI_CAST_PTR(struct acpi_resource_address32,

				  &resource->data);

		ACPI_COPY_ADDRESS(out, address32);

		break;