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

Commit 439913ff authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPI: replace acpi_integer by u64 



acpi_integer is now obsolete and removed from the ACPICA code base,
replaced by u64.

Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent aea9c04b

arch/ia64/hp/common/aml_nfw.c

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void aml_nfw_execute(struct ia64_nfw_context *c) 
		     c->arg[4], c->arg[5], c->arg[6], c->arg[7]);

}



static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value)

static void aml_nfw_read_arg(u8 *offset, u32 bit_width, u64 *value)

{

	switch (bit_width) {

	case 8:
@@ -95,7 +95,7 @@ static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value) 
	}

}



static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value)

static void aml_nfw_write_arg(u8 *offset, u32 bit_width, u64 *value)

{

	switch (bit_width) {

	case 8:
@@ -114,7 +114,7 @@ static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value) 
}



static acpi_status aml_nfw_handler(u32 function, acpi_physical_address address,

	u32 bit_width, acpi_integer *value, void *handler_context,

	u32 bit_width, u64 *value, void *handler_context,

	void *region_context)

{

	struct ia64_nfw_context *context = handler_context;

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+3 −3
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static int find_psb_table(struct powernow_k8_data *data) 
static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data,

		unsigned int index)

{

	acpi_integer control;

	u64 control;



	if (!data->acpi_data.state_count || (cpu_family == CPU_HW_PSTATE))

		return;
@@ -824,7 +824,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) 
{

	struct cpufreq_frequency_table *powernow_table;

	int ret_val = -ENODEV;

	acpi_integer control, status;

	u64 control, status;



	if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) {

		dprintk("register performance failed: bad ACPI data\n");
@@ -948,7 +948,7 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, 
		u32 fid;

		u32 vid;

		u32 freq, index;

		acpi_integer status, control;

		u64 status, control;



		if (data->exttype) {

			status =  data->acpi_data.states[i].status;

drivers/acpi/battery.c

+2 −2
Original line number Diff line number Diff line
@@ -324,8 +324,8 @@ static int extract_package(struct acpi_battery *battery, 
				strncpy(ptr, element->string.pointer, 32);

			else if (element->type == ACPI_TYPE_INTEGER) {

				strncpy(ptr, (u8 *)&element->integer.value,

					sizeof(acpi_integer));

				ptr[sizeof(acpi_integer)] = 0;

					sizeof(u64));

				ptr[sizeof(u64)] = 0;

			} else

				*ptr = 0; /* don't have value */

		} else {

drivers/acpi/ec.c

+2 −2
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ static u32 acpi_ec_gpe_handler(void *data) 


static acpi_status

acpi_ec_space_handler(u32 function, acpi_physical_address address,

		      u32 bits, acpi_integer *value,

		      u32 bits, u64 *value,

		      void *handler_context, void *region_context)

{

	struct acpi_ec *ec = handler_context;
@@ -620,7 +620,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, 
		++address;

		if (function == ACPI_READ) {

			result = acpi_ec_read(ec, address, &temp);

			(*value) |= ((acpi_integer)temp) << i;

			(*value) |= ((u64)temp) << i;

		} else {

			temp = 0xff & ((*value) >> i);

			result = acpi_ec_write(ec, address, temp);

drivers/acpi/glue.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle) 
/* Get device's handler per its address under its parent */

struct acpi_find_child {

	acpi_handle handle;

	acpi_integer address;

	u64 address;

};



static acpi_status
@@ -106,7 +106,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv) 
	return AE_OK;

}



acpi_handle acpi_get_child(acpi_handle parent, acpi_integer address)

acpi_handle acpi_get_child(acpi_handle parent, u64 address)

{

	struct acpi_find_child find = { NULL, address };