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>

1 files changed, 12 insertions, 12 deletions

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)
 
 #ifdef CONFIG_X86
 static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-                                        acpi_integer * value)
+                                        u64 *value)
 {
         struct cpuinfo_x86 *c;
         u64 msr_high, msr_low;
@@ -681,13 +681,13 @@ static int acpi_throttling_rdmsr(struct acpi_processor *pr,
                 rdmsr_safe(MSR_IA32_THERM_CONTROL,
                         (u32 *)&msr_low , (u32 *) &msr_high);
                 msr = (msr_high << 32) | msr_low;
-                *value = (acpi_integer) msr;
+                *value = (u64) msr;
                 ret = 0;
         }
         return ret;
 }
 
-static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
+static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
 {
         struct cpuinfo_x86 *c;
         unsigned int cpu;
@@ -711,14 +711,14 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
 }
 #else
 static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-                                acpi_integer * value)
+                                u64 *value)
 {
         printk(KERN_ERR PREFIX
                 "HARDWARE addr space,NOT supported yet\n");
         return -1;
 }
 
-static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
+static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
 {
         printk(KERN_ERR PREFIX
                 "HARDWARE addr space,NOT supported yet\n");
@@ -727,7 +727,7 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
 #endif
 
 static int acpi_read_throttling_status(struct acpi_processor *pr,
-                                        acpi_integer *value)
+                                        u64 *value)
 {
         u32 bit_width, bit_offset;
         u64 ptc_value;
@@ -746,7 +746,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
                                   address, (u32 *) &ptc_value,
                                   (u32) (bit_width + bit_offset));
                 ptc_mask = (1 << bit_width) - 1;
-                *value = (acpi_integer) ((ptc_value >> bit_offset) & ptc_mask);
+                *value = (u64) ((ptc_value >> bit_offset) & ptc_mask);
                 ret = 0;
                 break;
         case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@ -760,7 +760,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
 }
 
 static int acpi_write_throttling_state(struct acpi_processor *pr,
-                                acpi_integer value)
+                                u64 value)
 {
         u32 bit_width, bit_offset;
         u64 ptc_value;
@@ -793,7 +793,7 @@ static int acpi_write_throttling_state(struct acpi_processor *pr,
 }
 
 static int acpi_get_throttling_state(struct acpi_processor *pr,
-                                acpi_integer value)
+                                u64 value)
 {
         int i;
 
@@ -808,7 +808,7 @@ static int acpi_get_throttling_state(struct acpi_processor *pr,
 }
 
 static int acpi_get_throttling_value(struct acpi_processor *pr,
-                        int state, acpi_integer *value)
+                        int state, u64 *value)
 {
         int ret = -1;
 
@@ -826,7 +826,7 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
 {
         int state = 0;
         int ret;
-        acpi_integer value;
+        u64 value;
 
         if (!pr)
                 return -EINVAL;
@@ -993,7 +993,7 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
                                              int state, bool force)
 {
         int ret;
-        acpi_integer value;
+        u64 value;
 
         if (!pr)
                 return -EINVAL;