ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type

This type was introduced as the code was migrated from ACPI 1.0
(with 32-bit AML integers) to ACPI 2.0 (with 64-bit integers). It
is now obsolete and this change removes it from the ACPICA code
base, replaced by u64.  The original typedef has been retained
for now for compatibility with existing device driver code.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index adcaf3b89587..bda7aed0404b 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -51,8 +51,7 @@ ACPI_MODULE_NAME("exconvrt")
 
 /* Local prototypes */
 static u32
-acpi_ex_convert_to_ascii(acpi_integer integer,
-                         u16 base, u8 * string, u8 max_length);
+acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 max_length);
 
 /*******************************************************************************
  *
@@ -75,7 +74,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
 {
         union acpi_operand_object *return_desc;
         u8 *pointer;
-        acpi_integer result;
+        u64 result;
         u32 i;
         u32 count;
         acpi_status status;
@@ -155,7 +154,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
                          * Little endian is used, meaning that the first byte of the buffer
                          * is the LSB of the integer
                          */
-                        result |= (((acpi_integer) pointer[i]) << (i * 8));
+                        result |= (((u64) pointer[i]) << (i * 8));
                 }
                 break;
 
@@ -285,10 +284,9 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
  ******************************************************************************/
 
 static u32
-acpi_ex_convert_to_ascii(acpi_integer integer,
-                         u16 base, u8 * string, u8 data_width)
+acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width)
 {
-        acpi_integer digit;
+        u64 digit;
         u32 i;
         u32 j;
         u32 k = 0;
@@ -531,10 +529,9 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                  * (separated by commas or spaces)
                  */
                 for (i = 0; i < obj_desc->buffer.length; i++) {
-                        new_buf += acpi_ex_convert_to_ascii((acpi_integer)
-                                                            obj_desc->buffer.
-                                                            pointer[i], base,
-                                                            new_buf, 1);
+                        new_buf += acpi_ex_convert_to_ascii((u64) obj_desc->
+                                                            buffer.pointer[i],
+                                                            base, new_buf, 1);
                         *new_buf++ = separator; /* each separated by a comma or space */
                 }