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, 10 insertions, 15 deletions

diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
index 7cfa1d8164d0..35059a14eb72 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -70,9 +70,8 @@ ACPI_MODULE_NAME("utmath")
  *
  ******************************************************************************/
 acpi_status
-acpi_ut_short_divide(acpi_integer dividend,
-                     u32 divisor,
-                     acpi_integer * out_quotient, u32 * out_remainder)
+acpi_ut_short_divide(u64 dividend,
+                     u32 divisor, u64 *out_quotient, u32 *out_remainder)
 {
         union uint64_overlay dividend_ovl;
         union uint64_overlay quotient;
@@ -126,9 +125,8 @@ acpi_ut_short_divide(acpi_integer dividend,
  ******************************************************************************/
 
 acpi_status
-acpi_ut_divide(acpi_integer in_dividend,
-               acpi_integer in_divisor,
-               acpi_integer * out_quotient, acpi_integer * out_remainder)
+acpi_ut_divide(u64 in_dividend,
+               u64 in_divisor, u64 *out_quotient, u64 *out_remainder)
 {
         union uint64_overlay dividend;
         union uint64_overlay divisor;
@@ -199,9 +197,8 @@ acpi_ut_divide(acpi_integer in_dividend,
                  * The 64-bit remainder must be generated.
                  */
                 partial1 = quotient.part.lo * divisor.part.hi;
-                partial2.full =
-                    (acpi_integer) quotient.part.lo * divisor.part.lo;
-                partial3.full = (acpi_integer) partial2.part.hi + partial1;
+                partial2.full = (u64) quotient.part.lo * divisor.part.lo;
+                partial3.full = (u64) partial2.part.hi + partial1;
 
                 remainder.part.hi = partial3.part.lo;
                 remainder.part.lo = partial2.part.lo;
@@ -257,9 +254,8 @@ acpi_ut_divide(acpi_integer in_dividend,
  *
  ******************************************************************************/
 acpi_status
-acpi_ut_short_divide(acpi_integer in_dividend,
-                     u32 divisor,
-                     acpi_integer * out_quotient, u32 * out_remainder)
+acpi_ut_short_divide(u64 in_dividend,
+                     u32 divisor, u64 *out_quotient, u32 *out_remainder)
 {
 
         ACPI_FUNCTION_TRACE(ut_short_divide);
@@ -284,9 +280,8 @@ acpi_ut_short_divide(acpi_integer in_dividend,
 }
 
 acpi_status
-acpi_ut_divide(acpi_integer in_dividend,
-               acpi_integer in_divisor,
-               acpi_integer * out_quotient, acpi_integer * out_remainder)
+acpi_ut_divide(u64 in_dividend,
+               u64 in_divisor, u64 *out_quotient, u64 *out_remainder)
 {
         ACPI_FUNCTION_TRACE(ut_divide);