diff options
author | Lin Ming <ming.m.lin@intel.com> | 2010-01-27 21:53:19 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-01-28 01:47:33 -0500 |
commit | 439913fffd39374c3737186b22d2d56c3a0ae526 (patch) | |
tree | f6d5c809c1b77950a2cf7174fdee8667d527c87b | |
parent | aea9c04bcc257caad9841c283b90ec1b28267fae (diff) |
ACPI: replace acpi_integer by u64
acpi_integer is now obsolete and removed from the ACPICA code base,
replaced by u64.
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | arch/ia64/hp/common/aml_nfw.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 6 | ||||
-rw-r--r-- | drivers/acpi/battery.c | 4 | ||||
-rw-r--r-- | drivers/acpi/ec.c | 4 | ||||
-rw-r--r-- | drivers/acpi/glue.c | 4 | ||||
-rw-r--r-- | drivers/acpi/osl.c | 4 | ||||
-rw-r--r-- | drivers/acpi/power_meter.c | 30 | ||||
-rw-r--r-- | drivers/acpi/processor_idle.c | 2 | ||||
-rw-r--r-- | drivers/acpi/processor_throttling.c | 24 | ||||
-rw-r--r-- | drivers/acpi/utils.c | 16 | ||||
-rw-r--r-- | drivers/acpi/video.c | 2 | ||||
-rw-r--r-- | drivers/ata/libata-acpi.c | 4 | ||||
-rw-r--r-- | drivers/ide/ide-acpi.c | 8 | ||||
-rw-r--r-- | drivers/input/misc/atlas_btns.c | 2 | ||||
-rw-r--r-- | drivers/pci/pci-acpi.c | 2 | ||||
-rw-r--r-- | drivers/platform/x86/toshiba_bluetooth.c | 4 | ||||
-rw-r--r-- | drivers/platform/x86/wmi.c | 4 | ||||
-rw-r--r-- | include/acpi/acpi_bus.h | 6 | ||||
-rw-r--r-- | include/acpi/processor.h | 42 |
19 files changed, 87 insertions, 87 deletions
diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c index 4abd2c79bb1d..22078486d35d 100644 --- a/arch/ia64/hp/common/aml_nfw.c +++ b/arch/ia64/hp/common/aml_nfw.c | |||
@@ -77,7 +77,7 @@ static void aml_nfw_execute(struct ia64_nfw_context *c) | |||
77 | c->arg[4], c->arg[5], c->arg[6], c->arg[7]); | 77 | c->arg[4], c->arg[5], c->arg[6], c->arg[7]); |
78 | } | 78 | } |
79 | 79 | ||
80 | static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value) | 80 | static void aml_nfw_read_arg(u8 *offset, u32 bit_width, u64 *value) |
81 | { | 81 | { |
82 | switch (bit_width) { | 82 | switch (bit_width) { |
83 | case 8: | 83 | case 8: |
@@ -95,7 +95,7 @@ static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value) | |||
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||
98 | static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value) | 98 | static void aml_nfw_write_arg(u8 *offset, u32 bit_width, u64 *value) |
99 | { | 99 | { |
100 | switch (bit_width) { | 100 | switch (bit_width) { |
101 | case 8: | 101 | case 8: |
@@ -114,7 +114,7 @@ static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value) | |||
114 | } | 114 | } |
115 | 115 | ||
116 | static acpi_status aml_nfw_handler(u32 function, acpi_physical_address address, | 116 | static acpi_status aml_nfw_handler(u32 function, acpi_physical_address address, |
117 | u32 bit_width, acpi_integer *value, void *handler_context, | 117 | u32 bit_width, u64 *value, void *handler_context, |
118 | void *region_context) | 118 | void *region_context) |
119 | { | 119 | { |
120 | struct ia64_nfw_context *context = handler_context; | 120 | struct ia64_nfw_context *context = handler_context; |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index f125e5c551c0..55d42bc443e8 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | |||
@@ -806,7 +806,7 @@ static int find_psb_table(struct powernow_k8_data *data) | |||
806 | static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, | 806 | static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, |
807 | unsigned int index) | 807 | unsigned int index) |
808 | { | 808 | { |
809 | acpi_integer control; | 809 | u64 control; |
810 | 810 | ||
811 | if (!data->acpi_data.state_count || (cpu_family == CPU_HW_PSTATE)) | 811 | if (!data->acpi_data.state_count || (cpu_family == CPU_HW_PSTATE)) |
812 | return; | 812 | return; |
@@ -824,7 +824,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) | |||
824 | { | 824 | { |
825 | struct cpufreq_frequency_table *powernow_table; | 825 | struct cpufreq_frequency_table *powernow_table; |
826 | int ret_val = -ENODEV; | 826 | int ret_val = -ENODEV; |
827 | acpi_integer control, status; | 827 | u64 control, status; |
828 | 828 | ||
829 | if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) { | 829 | if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) { |
830 | dprintk("register performance failed: bad ACPI data\n"); | 830 | dprintk("register performance failed: bad ACPI data\n"); |
@@ -948,7 +948,7 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, | |||
948 | u32 fid; | 948 | u32 fid; |
949 | u32 vid; | 949 | u32 vid; |
950 | u32 freq, index; | 950 | u32 freq, index; |
951 | acpi_integer status, control; | 951 | u64 status, control; |
952 | 952 | ||
953 | if (data->exttype) { | 953 | if (data->exttype) { |
954 | status = data->acpi_data.states[i].status; | 954 | status = data->acpi_data.states[i].status; |
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index cada73ffdfa7..58d2c91ba62b 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -324,8 +324,8 @@ static int extract_package(struct acpi_battery *battery, | |||
324 | strncpy(ptr, element->string.pointer, 32); | 324 | strncpy(ptr, element->string.pointer, 32); |
325 | else if (element->type == ACPI_TYPE_INTEGER) { | 325 | else if (element->type == ACPI_TYPE_INTEGER) { |
326 | strncpy(ptr, (u8 *)&element->integer.value, | 326 | strncpy(ptr, (u8 *)&element->integer.value, |
327 | sizeof(acpi_integer)); | 327 | sizeof(u64)); |
328 | ptr[sizeof(acpi_integer)] = 0; | 328 | ptr[sizeof(u64)] = 0; |
329 | } else | 329 | } else |
330 | *ptr = 0; /* don't have value */ | 330 | *ptr = 0; /* don't have value */ |
331 | } else { | 331 | } else { |
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index d6471bb6852f..748ced85dec5 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -589,7 +589,7 @@ static u32 acpi_ec_gpe_handler(void *data) | |||
589 | 589 | ||
590 | static acpi_status | 590 | static acpi_status |
591 | acpi_ec_space_handler(u32 function, acpi_physical_address address, | 591 | acpi_ec_space_handler(u32 function, acpi_physical_address address, |
592 | u32 bits, acpi_integer *value, | 592 | u32 bits, u64 *value, |
593 | void *handler_context, void *region_context) | 593 | void *handler_context, void *region_context) |
594 | { | 594 | { |
595 | struct acpi_ec *ec = handler_context; | 595 | struct acpi_ec *ec = handler_context; |
@@ -620,7 +620,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, | |||
620 | ++address; | 620 | ++address; |
621 | if (function == ACPI_READ) { | 621 | if (function == ACPI_READ) { |
622 | result = acpi_ec_read(ec, address, &temp); | 622 | result = acpi_ec_read(ec, address, &temp); |
623 | (*value) |= ((acpi_integer)temp) << i; | 623 | (*value) |= ((u64)temp) << i; |
624 | } else { | 624 | } else { |
625 | temp = 0xff & ((*value) >> i); | 625 | temp = 0xff & ((*value) >> i); |
626 | result = acpi_ec_write(ec, address, temp); | 626 | result = acpi_ec_write(ec, address, temp); |
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 4c8fcff662cf..6d5b64b7d526 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
@@ -87,7 +87,7 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle) | |||
87 | /* Get device's handler per its address under its parent */ | 87 | /* Get device's handler per its address under its parent */ |
88 | struct acpi_find_child { | 88 | struct acpi_find_child { |
89 | acpi_handle handle; | 89 | acpi_handle handle; |
90 | acpi_integer address; | 90 | u64 address; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static acpi_status | 93 | static acpi_status |
@@ -106,7 +106,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
106 | return AE_OK; | 106 | return AE_OK; |
107 | } | 107 | } |
108 | 108 | ||
109 | acpi_handle acpi_get_child(acpi_handle parent, acpi_integer address) | 109 | acpi_handle acpi_get_child(acpi_handle parent, u64 address) |
110 | { | 110 | { |
111 | struct acpi_find_child find = { NULL, address }; | 111 | struct acpi_find_child find = { NULL, address }; |
112 | 112 | ||
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 02e8464e480f..8e6d8665f0ae 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -436,7 +436,7 @@ acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) | |||
436 | * Running in interpreter thread context, safe to sleep | 436 | * Running in interpreter thread context, safe to sleep |
437 | */ | 437 | */ |
438 | 438 | ||
439 | void acpi_os_sleep(acpi_integer ms) | 439 | void acpi_os_sleep(u64 ms) |
440 | { | 440 | { |
441 | schedule_timeout_interruptible(msecs_to_jiffies(ms)); | 441 | schedule_timeout_interruptible(msecs_to_jiffies(ms)); |
442 | } | 442 | } |
@@ -603,7 +603,7 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, | |||
603 | 603 | ||
604 | acpi_status | 604 | acpi_status |
605 | acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, | 605 | acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, |
606 | acpi_integer value, u32 width) | 606 | u64 value, u32 width) |
607 | { | 607 | { |
608 | int result, size; | 608 | int result, size; |
609 | 609 | ||
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c index dc4ffadf8122..834c5af0de4b 100644 --- a/drivers/acpi/power_meter.c +++ b/drivers/acpi/power_meter.c | |||
@@ -71,17 +71,17 @@ static const struct acpi_device_id power_meter_ids[] = { | |||
71 | MODULE_DEVICE_TABLE(acpi, power_meter_ids); | 71 | MODULE_DEVICE_TABLE(acpi, power_meter_ids); |
72 | 72 | ||
73 | struct acpi_power_meter_capabilities { | 73 | struct acpi_power_meter_capabilities { |
74 | acpi_integer flags; | 74 | u64 flags; |
75 | acpi_integer units; | 75 | u64 units; |
76 | acpi_integer type; | 76 | u64 type; |
77 | acpi_integer accuracy; | 77 | u64 accuracy; |
78 | acpi_integer sampling_time; | 78 | u64 sampling_time; |
79 | acpi_integer min_avg_interval; | 79 | u64 min_avg_interval; |
80 | acpi_integer max_avg_interval; | 80 | u64 max_avg_interval; |
81 | acpi_integer hysteresis; | 81 | u64 hysteresis; |
82 | acpi_integer configurable_cap; | 82 | u64 configurable_cap; |
83 | acpi_integer min_cap; | 83 | u64 min_cap; |
84 | acpi_integer max_cap; | 84 | u64 max_cap; |
85 | }; | 85 | }; |
86 | 86 | ||
87 | struct acpi_power_meter_resource { | 87 | struct acpi_power_meter_resource { |
@@ -93,9 +93,9 @@ struct acpi_power_meter_resource { | |||
93 | acpi_string model_number; | 93 | acpi_string model_number; |
94 | acpi_string serial_number; | 94 | acpi_string serial_number; |
95 | acpi_string oem_info; | 95 | acpi_string oem_info; |
96 | acpi_integer power; | 96 | u64 power; |
97 | acpi_integer cap; | 97 | u64 cap; |
98 | acpi_integer avg_interval; | 98 | u64 avg_interval; |
99 | int sensors_valid; | 99 | int sensors_valid; |
100 | unsigned long sensors_last_updated; | 100 | unsigned long sensors_last_updated; |
101 | struct sensor_device_attribute sensors[NUM_SENSORS]; | 101 | struct sensor_device_attribute sensors[NUM_SENSORS]; |
@@ -402,7 +402,7 @@ static ssize_t show_val(struct device *dev, | |||
402 | struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); | 402 | struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); |
403 | struct acpi_device *acpi_dev = to_acpi_device(dev); | 403 | struct acpi_device *acpi_dev = to_acpi_device(dev); |
404 | struct acpi_power_meter_resource *resource = acpi_dev->driver_data; | 404 | struct acpi_power_meter_resource *resource = acpi_dev->driver_data; |
405 | acpi_integer val = 0; | 405 | u64 val = 0; |
406 | 406 | ||
407 | switch (attr->index) { | 407 | switch (attr->index) { |
408 | case 0: | 408 | case 0: |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 7c0441f63b39..3455d7abf5f3 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -352,7 +352,7 @@ static int acpi_processor_get_power_info_default(struct acpi_processor *pr) | |||
352 | static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) | 352 | static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) |
353 | { | 353 | { |
354 | acpi_status status = 0; | 354 | acpi_status status = 0; |
355 | acpi_integer count; | 355 | u64 count; |
356 | int current_count; | 356 | int current_count; |
357 | int i; | 357 | int i; |
358 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 358 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index 1c5d7a8b2fdf..7ded7542fc9d 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c | |||
@@ -660,7 +660,7 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr) | |||
660 | 660 | ||
661 | #ifdef CONFIG_X86 | 661 | #ifdef CONFIG_X86 |
662 | static int acpi_throttling_rdmsr(struct acpi_processor *pr, | 662 | static int acpi_throttling_rdmsr(struct acpi_processor *pr, |
663 | acpi_integer * value) | 663 | u64 *value) |
664 | { | 664 | { |
665 | struct cpuinfo_x86 *c; | 665 | struct cpuinfo_x86 *c; |
666 | u64 msr_high, msr_low; | 666 | u64 msr_high, msr_low; |
@@ -681,13 +681,13 @@ static int acpi_throttling_rdmsr(struct acpi_processor *pr, | |||
681 | rdmsr_safe(MSR_IA32_THERM_CONTROL, | 681 | rdmsr_safe(MSR_IA32_THERM_CONTROL, |
682 | (u32 *)&msr_low , (u32 *) &msr_high); | 682 | (u32 *)&msr_low , (u32 *) &msr_high); |
683 | msr = (msr_high << 32) | msr_low; | 683 | msr = (msr_high << 32) | msr_low; |
684 | *value = (acpi_integer) msr; | 684 | *value = (u64) msr; |
685 | ret = 0; | 685 | ret = 0; |
686 | } | 686 | } |
687 | return ret; | 687 | return ret; |
688 | } | 688 | } |
689 | 689 | ||
690 | static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value) | 690 | static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value) |
691 | { | 691 | { |
692 | struct cpuinfo_x86 *c; | 692 | struct cpuinfo_x86 *c; |
693 | unsigned int cpu; | 693 | unsigned int cpu; |
@@ -711,14 +711,14 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value) | |||
711 | } | 711 | } |
712 | #else | 712 | #else |
713 | static int acpi_throttling_rdmsr(struct acpi_processor *pr, | 713 | static int acpi_throttling_rdmsr(struct acpi_processor *pr, |
714 | acpi_integer * value) | 714 | u64 *value) |
715 | { | 715 | { |
716 | printk(KERN_ERR PREFIX | 716 | printk(KERN_ERR PREFIX |
717 | "HARDWARE addr space,NOT supported yet\n"); | 717 | "HARDWARE addr space,NOT supported yet\n"); |
718 | return -1; | 718 | return -1; |
719 | } | 719 | } |
720 | 720 | ||
721 | static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value) | 721 | static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value) |
722 | { | 722 | { |
723 | printk(KERN_ERR PREFIX | 723 | printk(KERN_ERR PREFIX |
724 | "HARDWARE addr space,NOT supported yet\n"); | 724 | "HARDWARE addr space,NOT supported yet\n"); |
@@ -727,7 +727,7 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value) | |||
727 | #endif | 727 | #endif |
728 | 728 | ||
729 | static int acpi_read_throttling_status(struct acpi_processor *pr, | 729 | static int acpi_read_throttling_status(struct acpi_processor *pr, |
730 | acpi_integer *value) | 730 | u64 *value) |
731 | { | 731 | { |
732 | u32 bit_width, bit_offset; | 732 | u32 bit_width, bit_offset; |
733 | u64 ptc_value; | 733 | u64 ptc_value; |
@@ -746,7 +746,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr, | |||
746 | address, (u32 *) &ptc_value, | 746 | address, (u32 *) &ptc_value, |
747 | (u32) (bit_width + bit_offset)); | 747 | (u32) (bit_width + bit_offset)); |
748 | ptc_mask = (1 << bit_width) - 1; | 748 | ptc_mask = (1 << bit_width) - 1; |
749 | *value = (acpi_integer) ((ptc_value >> bit_offset) & ptc_mask); | 749 | *value = (u64) ((ptc_value >> bit_offset) & ptc_mask); |
750 | ret = 0; | 750 | ret = 0; |
751 | break; | 751 | break; |
752 | case ACPI_ADR_SPACE_FIXED_HARDWARE: | 752 | case ACPI_ADR_SPACE_FIXED_HARDWARE: |
@@ -760,7 +760,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr, | |||
760 | } | 760 | } |
761 | 761 | ||
762 | static int acpi_write_throttling_state(struct acpi_processor *pr, | 762 | static int acpi_write_throttling_state(struct acpi_processor *pr, |
763 | acpi_integer value) | 763 | u64 value) |
764 | { | 764 | { |
765 | u32 bit_width, bit_offset; | 765 | u32 bit_width, bit_offset; |
766 | u64 ptc_value; | 766 | u64 ptc_value; |
@@ -793,7 +793,7 @@ static int acpi_write_throttling_state(struct acpi_processor *pr, | |||
793 | } | 793 | } |
794 | 794 | ||
795 | static int acpi_get_throttling_state(struct acpi_processor *pr, | 795 | static int acpi_get_throttling_state(struct acpi_processor *pr, |
796 | acpi_integer value) | 796 | u64 value) |
797 | { | 797 | { |
798 | int i; | 798 | int i; |
799 | 799 | ||
@@ -808,7 +808,7 @@ static int acpi_get_throttling_state(struct acpi_processor *pr, | |||
808 | } | 808 | } |
809 | 809 | ||
810 | static int acpi_get_throttling_value(struct acpi_processor *pr, | 810 | static int acpi_get_throttling_value(struct acpi_processor *pr, |
811 | int state, acpi_integer *value) | 811 | int state, u64 *value) |
812 | { | 812 | { |
813 | int ret = -1; | 813 | int ret = -1; |
814 | 814 | ||
@@ -826,7 +826,7 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr) | |||
826 | { | 826 | { |
827 | int state = 0; | 827 | int state = 0; |
828 | int ret; | 828 | int ret; |
829 | acpi_integer value; | 829 | u64 value; |
830 | 830 | ||
831 | if (!pr) | 831 | if (!pr) |
832 | return -EINVAL; | 832 | return -EINVAL; |
@@ -993,7 +993,7 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr, | |||
993 | int state, bool force) | 993 | int state, bool force) |
994 | { | 994 | { |
995 | int ret; | 995 | int ret; |
996 | acpi_integer value; | 996 | u64 value; |
997 | 997 | ||
998 | if (!pr) | 998 | if (!pr) |
999 | return -EINVAL; | 999 | return -EINVAL; |
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 811fec10462b..11882dbe2094 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c | |||
@@ -107,12 +107,12 @@ acpi_extract_package(union acpi_object *package, | |||
107 | case ACPI_TYPE_INTEGER: | 107 | case ACPI_TYPE_INTEGER: |
108 | switch (format_string[i]) { | 108 | switch (format_string[i]) { |
109 | case 'N': | 109 | case 'N': |
110 | size_required += sizeof(acpi_integer); | 110 | size_required += sizeof(u64); |
111 | tail_offset += sizeof(acpi_integer); | 111 | tail_offset += sizeof(u64); |
112 | break; | 112 | break; |
113 | case 'S': | 113 | case 'S': |
114 | size_required += | 114 | size_required += |
115 | sizeof(char *) + sizeof(acpi_integer) + | 115 | sizeof(char *) + sizeof(u64) + |
116 | sizeof(char); | 116 | sizeof(char); |
117 | tail_offset += sizeof(char *); | 117 | tail_offset += sizeof(char *); |
118 | break; | 118 | break; |
@@ -193,17 +193,17 @@ acpi_extract_package(union acpi_object *package, | |||
193 | case ACPI_TYPE_INTEGER: | 193 | case ACPI_TYPE_INTEGER: |
194 | switch (format_string[i]) { | 194 | switch (format_string[i]) { |
195 | case 'N': | 195 | case 'N': |
196 | *((acpi_integer *) head) = | 196 | *((u64 *) head) = |
197 | element->integer.value; | 197 | element->integer.value; |
198 | head += sizeof(acpi_integer); | 198 | head += sizeof(u64); |
199 | break; | 199 | break; |
200 | case 'S': | 200 | case 'S': |
201 | pointer = (u8 **) head; | 201 | pointer = (u8 **) head; |
202 | *pointer = tail; | 202 | *pointer = tail; |
203 | *((acpi_integer *) tail) = | 203 | *((u64 *) tail) = |
204 | element->integer.value; | 204 | element->integer.value; |
205 | head += sizeof(acpi_integer *); | 205 | head += sizeof(u64 *); |
206 | tail += sizeof(acpi_integer); | 206 | tail += sizeof(u64); |
207 | /* NULL terminate string */ | 207 | /* NULL terminate string */ |
208 | *tail = (char)0; | 208 | *tail = (char)0; |
209 | tail += sizeof(char); | 209 | tail += sizeof(char); |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index b765790b32be..6e9b49149fce 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -759,7 +759,7 @@ acpi_video_bus_POST_options(struct acpi_video_bus *video, | |||
759 | static int | 759 | static int |
760 | acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag) | 760 | acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag) |
761 | { | 761 | { |
762 | acpi_integer status = 0; | 762 | u64 status = 0; |
763 | union acpi_object arg0 = { ACPI_TYPE_INTEGER }; | 763 | union acpi_object arg0 = { ACPI_TYPE_INTEGER }; |
764 | struct acpi_object_list args = { 1, &arg0 }; | 764 | struct acpi_object_list args = { 1, &arg0 }; |
765 | 765 | ||
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 1245838ac13d..292fdbc0431a 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
@@ -64,7 +64,7 @@ void ata_acpi_associate_sata_port(struct ata_port *ap) | |||
64 | WARN_ON(!(ap->flags & ATA_FLAG_ACPI_SATA)); | 64 | WARN_ON(!(ap->flags & ATA_FLAG_ACPI_SATA)); |
65 | 65 | ||
66 | if (!sata_pmp_attached(ap)) { | 66 | if (!sata_pmp_attached(ap)) { |
67 | acpi_integer adr = SATA_ADR(ap->port_no, NO_PORT_MULT); | 67 | u64 adr = SATA_ADR(ap->port_no, NO_PORT_MULT); |
68 | 68 | ||
69 | ap->link.device->acpi_handle = | 69 | ap->link.device->acpi_handle = |
70 | acpi_get_child(ap->host->acpi_handle, adr); | 70 | acpi_get_child(ap->host->acpi_handle, adr); |
@@ -74,7 +74,7 @@ void ata_acpi_associate_sata_port(struct ata_port *ap) | |||
74 | ap->link.device->acpi_handle = NULL; | 74 | ap->link.device->acpi_handle = NULL; |
75 | 75 | ||
76 | ata_for_each_link(link, ap, EDGE) { | 76 | ata_for_each_link(link, ap, EDGE) { |
77 | acpi_integer adr = SATA_ADR(ap->port_no, link->pmp); | 77 | u64 adr = SATA_ADR(ap->port_no, link->pmp); |
78 | 78 | ||
79 | link->device->acpi_handle = | 79 | link->device->acpi_handle = |
80 | acpi_get_child(ap->host->acpi_handle, adr); | 80 | acpi_get_child(ap->host->acpi_handle, adr); |
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index c0cf45a11b93..5cb01e5c323c 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
@@ -108,11 +108,11 @@ bool ide_port_acpi(ide_hwif_t *hwif) | |||
108 | * Returns 0 on success, <0 on error. | 108 | * Returns 0 on success, <0 on error. |
109 | */ | 109 | */ |
110 | static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, | 110 | static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, |
111 | acpi_integer *pcidevfn) | 111 | u64 *pcidevfn) |
112 | { | 112 | { |
113 | struct pci_dev *pdev = to_pci_dev(dev); | 113 | struct pci_dev *pdev = to_pci_dev(dev); |
114 | unsigned int bus, devnum, func; | 114 | unsigned int bus, devnum, func; |
115 | acpi_integer addr; | 115 | u64 addr; |
116 | acpi_handle dev_handle; | 116 | acpi_handle dev_handle; |
117 | acpi_status status; | 117 | acpi_status status; |
118 | struct acpi_device_info *dinfo = NULL; | 118 | struct acpi_device_info *dinfo = NULL; |
@@ -122,7 +122,7 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, | |||
122 | devnum = PCI_SLOT(pdev->devfn); | 122 | devnum = PCI_SLOT(pdev->devfn); |
123 | func = PCI_FUNC(pdev->devfn); | 123 | func = PCI_FUNC(pdev->devfn); |
124 | /* ACPI _ADR encoding for PCI bus: */ | 124 | /* ACPI _ADR encoding for PCI bus: */ |
125 | addr = (acpi_integer)(devnum << 16 | func); | 125 | addr = (u64)(devnum << 16 | func); |
126 | 126 | ||
127 | DEBPRINT("ENTER: pci %02x:%02x.%01x\n", bus, devnum, func); | 127 | DEBPRINT("ENTER: pci %02x:%02x.%01x\n", bus, devnum, func); |
128 | 128 | ||
@@ -169,7 +169,7 @@ static acpi_handle ide_acpi_hwif_get_handle(ide_hwif_t *hwif) | |||
169 | { | 169 | { |
170 | struct device *dev = hwif->gendev.parent; | 170 | struct device *dev = hwif->gendev.parent; |
171 | acpi_handle uninitialized_var(dev_handle); | 171 | acpi_handle uninitialized_var(dev_handle); |
172 | acpi_integer pcidevfn; | 172 | u64 pcidevfn; |
173 | acpi_handle chan_handle; | 173 | acpi_handle chan_handle; |
174 | int err; | 174 | int err; |
175 | 175 | ||
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c index 1b871917340a..dfaa9a045ed8 100644 --- a/drivers/input/misc/atlas_btns.c +++ b/drivers/input/misc/atlas_btns.c | |||
@@ -47,7 +47,7 @@ static acpi_status acpi_atlas_button_setup(acpi_handle region_handle, | |||
47 | 47 | ||
48 | static acpi_status acpi_atlas_button_handler(u32 function, | 48 | static acpi_status acpi_atlas_button_handler(u32 function, |
49 | acpi_physical_address address, | 49 | acpi_physical_address address, |
50 | u32 bit_width, acpi_integer *value, | 50 | u32 bit_width, u64 *value, |
51 | void *handler_context, void *region_context) | 51 | void *handler_context, void *region_context) |
52 | { | 52 | { |
53 | acpi_status status; | 53 | acpi_status status; |
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 7e2829538a4c..441326c44138 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
@@ -143,7 +143,7 @@ static struct pci_platform_pm_ops acpi_pci_platform_pm = { | |||
143 | static int acpi_pci_find_device(struct device *dev, acpi_handle *handle) | 143 | static int acpi_pci_find_device(struct device *dev, acpi_handle *handle) |
144 | { | 144 | { |
145 | struct pci_dev * pci_dev; | 145 | struct pci_dev * pci_dev; |
146 | acpi_integer addr; | 146 | u64 addr; |
147 | 147 | ||
148 | pci_dev = to_pci_dev(dev); | 148 | pci_dev = to_pci_dev(dev); |
149 | /* Please ref to ACPI spec for the syntax of _ADR */ | 149 | /* Please ref to ACPI spec for the syntax of _ADR */ |
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c index a350418e87ea..944068611919 100644 --- a/drivers/platform/x86/toshiba_bluetooth.c +++ b/drivers/platform/x86/toshiba_bluetooth.c | |||
@@ -57,7 +57,7 @@ static struct acpi_driver toshiba_bt_rfkill_driver = { | |||
57 | static int toshiba_bluetooth_enable(acpi_handle handle) | 57 | static int toshiba_bluetooth_enable(acpi_handle handle) |
58 | { | 58 | { |
59 | acpi_status res1, res2; | 59 | acpi_status res1, res2; |
60 | acpi_integer result; | 60 | u64 result; |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Query ACPI to verify RFKill switch is set to 'on'. | 63 | * Query ACPI to verify RFKill switch is set to 'on'. |
@@ -95,7 +95,7 @@ static int toshiba_bt_resume(struct acpi_device *device) | |||
95 | static int toshiba_bt_rfkill_add(struct acpi_device *device) | 95 | static int toshiba_bt_rfkill_add(struct acpi_device *device) |
96 | { | 96 | { |
97 | acpi_status status; | 97 | acpi_status status; |
98 | acpi_integer bt_present; | 98 | u64 bt_present; |
99 | int result = -ENODEV; | 99 | int result = -ENODEV; |
100 | 100 | ||
101 | /* | 101 | /* |
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index b104302fea0a..09e9918c69c1 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c | |||
@@ -796,7 +796,7 @@ static __init acpi_status parse_wdg(acpi_handle handle) | |||
796 | */ | 796 | */ |
797 | static acpi_status | 797 | static acpi_status |
798 | acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address, | 798 | acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address, |
799 | u32 bits, acpi_integer * value, | 799 | u32 bits, u64 *value, |
800 | void *handler_context, void *region_context) | 800 | void *handler_context, void *region_context) |
801 | { | 801 | { |
802 | int result = 0, i = 0; | 802 | int result = 0, i = 0; |
@@ -813,7 +813,7 @@ acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address, | |||
813 | 813 | ||
814 | if (function == ACPI_READ) { | 814 | if (function == ACPI_READ) { |
815 | result = ec_read(address, &temp); | 815 | result = ec_read(address, &temp); |
816 | (*value) |= ((acpi_integer)temp) << i; | 816 | (*value) |= ((u64)temp) << i; |
817 | } else { | 817 | } else { |
818 | temp = 0xff & ((*value) >> i); | 818 | temp = 0xff & ((*value) >> i); |
819 | result = ec_write(address, temp); | 819 | result = ec_write(address, temp); |
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 3cd9ccdcbd8f..71c105c9b0ee 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -250,8 +250,8 @@ struct acpi_device_wakeup_state { | |||
250 | 250 | ||
251 | struct acpi_device_wakeup { | 251 | struct acpi_device_wakeup { |
252 | acpi_handle gpe_device; | 252 | acpi_handle gpe_device; |
253 | acpi_integer gpe_number; | 253 | u64 gpe_number; |
254 | acpi_integer sleep_state; | 254 | u64 sleep_state; |
255 | struct acpi_handle_list resources; | 255 | struct acpi_handle_list resources; |
256 | struct acpi_device_wakeup_state state; | 256 | struct acpi_device_wakeup_state state; |
257 | struct acpi_device_wakeup_flags flags; | 257 | struct acpi_device_wakeup_flags flags; |
@@ -380,7 +380,7 @@ struct acpi_pci_root { | |||
380 | }; | 380 | }; |
381 | 381 | ||
382 | /* helper */ | 382 | /* helper */ |
383 | acpi_handle acpi_get_child(acpi_handle, acpi_integer); | 383 | acpi_handle acpi_get_child(acpi_handle, u64); |
384 | int acpi_is_root_bridge(acpi_handle); | 384 | int acpi_is_root_bridge(acpi_handle); |
385 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | 385 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); |
386 | struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); | 386 | struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); |
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 0ea5ef4eb6a9..29831768c0e6 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -92,11 +92,11 @@ struct acpi_processor_power { | |||
92 | /* Performance Management */ | 92 | /* Performance Management */ |
93 | 93 | ||
94 | struct acpi_psd_package { | 94 | struct acpi_psd_package { |
95 | acpi_integer num_entries; | 95 | u64 num_entries; |
96 | acpi_integer revision; | 96 | u64 revision; |
97 | acpi_integer domain; | 97 | u64 domain; |
98 | acpi_integer coord_type; | 98 | u64 coord_type; |
99 | acpi_integer num_processors; | 99 | u64 num_processors; |
100 | } __attribute__ ((packed)); | 100 | } __attribute__ ((packed)); |
101 | 101 | ||
102 | struct acpi_pct_register { | 102 | struct acpi_pct_register { |
@@ -110,12 +110,12 @@ struct acpi_pct_register { | |||
110 | } __attribute__ ((packed)); | 110 | } __attribute__ ((packed)); |
111 | 111 | ||
112 | struct acpi_processor_px { | 112 | struct acpi_processor_px { |
113 | acpi_integer core_frequency; /* megahertz */ | 113 | u64 core_frequency; /* megahertz */ |
114 | acpi_integer power; /* milliWatts */ | 114 | u64 power; /* milliWatts */ |
115 | acpi_integer transition_latency; /* microseconds */ | 115 | u64 transition_latency; /* microseconds */ |
116 | acpi_integer bus_master_latency; /* microseconds */ | 116 | u64 bus_master_latency; /* microseconds */ |
117 | acpi_integer control; /* control value */ | 117 | u64 control; /* control value */ |
118 | acpi_integer status; /* success indicator */ | 118 | u64 status; /* success indicator */ |
119 | }; | 119 | }; |
120 | 120 | ||
121 | struct acpi_processor_performance { | 121 | struct acpi_processor_performance { |
@@ -133,11 +133,11 @@ struct acpi_processor_performance { | |||
133 | /* Throttling Control */ | 133 | /* Throttling Control */ |
134 | 134 | ||
135 | struct acpi_tsd_package { | 135 | struct acpi_tsd_package { |
136 | acpi_integer num_entries; | 136 | u64 num_entries; |
137 | acpi_integer revision; | 137 | u64 revision; |
138 | acpi_integer domain; | 138 | u64 domain; |
139 | acpi_integer coord_type; | 139 | u64 coord_type; |
140 | acpi_integer num_processors; | 140 | u64 num_processors; |
141 | } __attribute__ ((packed)); | 141 | } __attribute__ ((packed)); |
142 | 142 | ||
143 | struct acpi_ptc_register { | 143 | struct acpi_ptc_register { |
@@ -151,11 +151,11 @@ struct acpi_ptc_register { | |||
151 | } __attribute__ ((packed)); | 151 | } __attribute__ ((packed)); |
152 | 152 | ||
153 | struct acpi_processor_tx_tss { | 153 | struct acpi_processor_tx_tss { |
154 | acpi_integer freqpercentage; /* */ | 154 | u64 freqpercentage; /* */ |
155 | acpi_integer power; /* milliWatts */ | 155 | u64 power; /* milliWatts */ |
156 | acpi_integer transition_latency; /* microseconds */ | 156 | u64 transition_latency; /* microseconds */ |
157 | acpi_integer control; /* control value */ | 157 | u64 control; /* control value */ |
158 | acpi_integer status; /* success indicator */ | 158 | u64 status; /* success indicator */ |
159 | }; | 159 | }; |
160 | struct acpi_processor_tx { | 160 | struct acpi_processor_tx { |
161 | u16 power; | 161 | u16 power; |