aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2010-01-27 21:53:19 -0500
committerLen Brown <len.brown@intel.com>2010-01-28 01:47:33 -0500
commit439913fffd39374c3737186b22d2d56c3a0ae526 (patch)
treef6d5c809c1b77950a2cf7174fdee8667d527c87b /drivers/platform/x86
parentaea9c04bcc257caad9841c283b90ec1b28267fae (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>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/toshiba_bluetooth.c4
-rw-r--r--drivers/platform/x86/wmi.c4
2 files changed, 4 insertions, 4 deletions
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 = {
57static int toshiba_bluetooth_enable(acpi_handle handle) 57static 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)
95static int toshiba_bt_rfkill_add(struct acpi_device *device) 95static 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 */
797static acpi_status 797static acpi_status
798acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address, 798acpi_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);