ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type

[pandora-kernel.git] / drivers / acpi / acpica / exregion.c

diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 0cd88f6..486b2e5 100644 (file)
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -70,7 +70,7 @@ acpi_status
 acpi_ex_system_memory_space_handler(u32 function,
                                    acpi_physical_address address,
                                    u32 bit_width,
-                                   acpi_integer * value,
+                                   u64 *value,
                                    void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -115,8 +115,7 @@ acpi_ex_system_memory_space_handler(u32 function,
         * Hardware does not support non-aligned data transfers, we must verify
         * the request.
         */
-       (void)acpi_ut_short_divide((acpi_integer) address, length, NULL,
-                                  &remainder);
+       (void)acpi_ut_short_divide((u64) address, length, NULL, &remainder);
        if (remainder != 0) {
                return_ACPI_STATUS(AE_AML_ALIGNMENT);
        }
@@ -128,10 +127,9 @@ acpi_ex_system_memory_space_handler(u32 function,
         *    2) Address beyond the current mapping?
         */
        if ((address < mem_info->mapped_physical_address) ||
-           (((acpi_integer) address + length) > ((acpi_integer)
-                                                 mem_info->
-                                                 mapped_physical_address +
-                                                 mem_info->mapped_length))) {
+           (((u64) address + length) > ((u64)
+                                        mem_info->mapped_physical_address +
+                                        mem_info->mapped_length))) {
                /*
                 * The request cannot be resolved by the current memory mapping;
                 * Delete the existing mapping and create a new one.
@@ -193,8 +191,7 @@ acpi_ex_system_memory_space_handler(u32 function,
         * access
         */
        logical_addr_ptr = mem_info->mapped_logical_address +
-           ((acpi_integer) address -
-            (acpi_integer) mem_info->mapped_physical_address);
+           ((u64) address - (u64) mem_info->mapped_physical_address);
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n",
@@ -215,19 +212,19 @@ acpi_ex_system_memory_space_handler(u32 function,
                *value = 0;
                switch (bit_width) {
                case 8:
-                       *value = (acpi_integer) ACPI_GET8(logical_addr_ptr);
+                       *value = (u64) ACPI_GET8(logical_addr_ptr);
                        break;
 
                case 16:
-                       *value = (acpi_integer) ACPI_GET16(logical_addr_ptr);
+                       *value = (u64) ACPI_GET16(logical_addr_ptr);
                        break;
 
                case 32:
-                       *value = (acpi_integer) ACPI_GET32(logical_addr_ptr);
+                       *value = (u64) ACPI_GET32(logical_addr_ptr);
                        break;
 
                case 64:
-                       *value = (acpi_integer) ACPI_GET64(logical_addr_ptr);
+                       *value = (u64) ACPI_GET64(logical_addr_ptr);
                        break;
 
                default:
@@ -291,7 +288,7 @@ acpi_status
 acpi_ex_system_io_space_handler(u32 function,
                                acpi_physical_address address,
                                u32 bit_width,
-                               acpi_integer * value,
+                               u64 *value,
                                void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -350,7 +347,7 @@ acpi_status
 acpi_ex_pci_config_space_handler(u32 function,
                                 acpi_physical_address address,
                                 u32 bit_width,
-                                acpi_integer * value,
+                                u64 *value,
                                 void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -425,7 +422,7 @@ acpi_status
 acpi_ex_cmos_space_handler(u32 function,
                           acpi_physical_address address,
                           u32 bit_width,
-                          acpi_integer * value,
+                          u64 *value,
                           void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -457,7 +454,7 @@ acpi_status
 acpi_ex_pci_bar_space_handler(u32 function,
                              acpi_physical_address address,
                              u32 bit_width,
-                             acpi_integer * value,
+                             u64 *value,
                              void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -489,7 +486,7 @@ acpi_status
 acpi_ex_data_table_space_handler(u32 function,
                                 acpi_physical_address address,
                                 u32 bit_width,
-                                acpi_integer * value,
+                                u64 *value,
                                 void *handler_context, void *region_context)
 {
        ACPI_FUNCTION_TRACE(ex_data_table_space_handler);