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

Commit 67a119f9 authored by Bob Moore's avatar Bob Moore Committed by Andi Kleen
Browse files

ACPICA: Eliminate acpi_native_uint type v2 



No longer needed; replaced mostly with u32, but also acpi_size
where a type that changes 32/64 bit on 32/64-bit platforms is
required.

v2: Fix a cast of a 32-bit int to a pointer in ACPI to avoid a compiler warning.
from David Howells

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>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent 11f2a61a

drivers/acpi/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ static int __init acpi_bus_init_irq(void) 
	return 0;

}



acpi_native_uint acpi_gbl_permanent_mmap;

u8 acpi_gbl_permanent_mmap;





void __init acpi_early_init(void)

drivers/acpi/dispatcher/dsinit.c

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

drivers/acpi/dispatcher/dsopcode.c

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,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);

drivers/acpi/dispatcher/dswstate.c

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

		}

drivers/acpi/events/evevent.c

+3 −3
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ acpi_status acpi_ev_install_xrupt_handlers(void) 


static acpi_status acpi_ev_fixed_event_initialize(void)

{

	acpi_native_uint i;

	u32 i;

	acpi_status status;



	/*
@@ -231,7 +231,7 @@ u32 acpi_ev_fixed_event_detect(void) 
	u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;

	u32 fixed_status;

	u32 fixed_enable;

	acpi_native_uint i;

	u32 i;



	ACPI_FUNCTION_NAME(ev_fixed_event_detect);
@@ -260,7 +260,7 @@ u32 acpi_ev_fixed_event_detect(void) 


			/* Found an active (signalled) event */

			acpi_os_fixed_event_count(i);

			int_status |= acpi_ev_fixed_event_dispatch((u32) i);

			int_status |= acpi_ev_fixed_event_dispatch(i);

		}

	}