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>

3 files changed, 19 insertions, 14 deletions

diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index c7e9431e16f1..b396854b83b0 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -196,7 +196,7 @@ acpi_os_hotplug_execute(acpi_osd_exec_callback function, void *context);
 
 void acpi_os_wait_events_complete(void *context);
 
-void acpi_os_sleep(acpi_integer milliseconds);
+void acpi_os_sleep(u64 milliseconds);
 
 void acpi_os_stall(u32 microseconds);
 
@@ -227,7 +227,7 @@ acpi_os_read_pci_configuration(struct acpi_pci_id *pci_id,
 
 acpi_status
 acpi_os_write_pci_configuration(struct acpi_pci_id *pci_id,
-                                u32 reg, acpi_integer value, u32 width);
+                                u32 reg, u64 value, u32 width);
 
 /*
  * Interim function needed for PCI IRQ routing
diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
index dc6302e94793..e5526354ba5e 100644
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -397,7 +397,7 @@ struct acpi_resource {
 struct acpi_pci_routing_table {
         u32 length;
         u32 pin;
-        acpi_integer address;   /* here for 64-bit alignment */
+        u64 address;            /* here for 64-bit alignment */
         u32 source_index;
         char source[4];         /* pad to 64 bits so sizeof() works in all cases */
 };
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 4e65c201dcd4..07f2cdcc5eb1 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -390,14 +390,6 @@ struct uint32_struct {
         u32 hi;
 };
 
-/*
- * Acpi integer width. In ACPI version 1, integers are 32 bits. In ACPI
- * version 2, integers are 64 bits. Note that this pertains to the ACPI integer
- * type only, not other integers used in the implementation of the ACPI CA
- * subsystem.
- */
-typedef unsigned long long acpi_integer;
-#define ACPI_INTEGER_MAX                ACPI_UINT64_MAX
 #define ACPI_INTEGER_BIT_SIZE           64
 #define ACPI_MAX_DECIMAL_DIGITS         20      /* 2^64 = 18,446,744,073,709,551,616 */
 
@@ -421,6 +413,19 @@ typedef unsigned long long acpi_integer;
 #define ACPI_WAIT_FOREVER               0xFFFF  /* u16, as per ACPI spec */
 #define ACPI_DO_NOT_WAIT                0
 
+/*
+ * Obsolete: Acpi integer width. In ACPI version 1 (1996), integers are 32 bits.
+ * In ACPI version 2 (2000) and later, integers are 64 bits. Note that this
+ * pertains to the ACPI integer type only, not to other integers used in the
+ * implementation of the ACPICA subsystem.
+ *
+ * 01/2010: This type is obsolete and has been removed from the entire ACPICA
+ * code base. It remains here for compatibility with device drivers that use
+ * the type. However, it will be removed in the future.
+ */
+typedef u64 acpi_integer;
+#define ACPI_INTEGER_MAX                ACPI_UINT64_MAX
+
 /*******************************************************************************
  *
  * Commonly used macros
@@ -801,7 +806,7 @@ union acpi_object {
         acpi_object_type type;  /* See definition of acpi_ns_type for values */
         struct {
                 acpi_object_type type;  /* ACPI_TYPE_INTEGER */
-                acpi_integer value;     /* The actual number */
+                u64 value;      /* The actual number */
         } integer;
 
         struct {
@@ -945,7 +950,7 @@ typedef
 acpi_status(*acpi_adr_space_handler) (u32 function,
                                       acpi_physical_address address,
                                       u32 bit_width,
-                                      acpi_integer * value,
+                                      u64 *value,
                                       void *handler_context,
                                       void *region_context);
 
@@ -1005,7 +1010,7 @@ struct acpi_device_info {
         u8 highest_dstates[4];  /* _sx_d values: 0xFF indicates not valid */
         u8 lowest_dstates[5];   /* _sx_w values: 0xFF indicates not valid */
         u32 current_status;     /* _STA value */
-        acpi_integer address;   /* _ADR value */
+        u64 address;    /* _ADR value */
         struct acpica_device_id hardware_id;    /* _HID value */
         struct acpica_device_id unique_id;      /* _UID value */
         struct acpica_device_id_list compatible_id_list;        /* _CID list <must be last> */