ACPICA: Removed all 16-bit support.

Support for 16-bit ACPICA has been completely removed since it is
no longer necessary and it clutters the code. All 16-bit macros,
types, and conditional compiles have been removed, cleaning up
and simplifying the code across the entire subsystem.
DOS support is no longer needed since the Linux firmware kit
is now available.

Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

5 files changed, 12 insertions, 23 deletions

diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 8a6f01a136d7..a23634ca42ee 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -796,12 +796,12 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                     (u8) (gpe_block->block_base_number +
                           (i * ACPI_GPE_REGISTER_WIDTH));
 
-                ACPI_STORE_ADDRESS(this_register->status_address.address,
-                                   (gpe_block->block_address.address + i));
+                this_register->status_address.address =
+                    gpe_block->block_address.address + i;
 
-                ACPI_STORE_ADDRESS(this_register->enable_address.address,
-                                   (gpe_block->block_address.address
-                                    + i + gpe_block->register_count));
+                this_register->enable_address.address =
+                    gpe_block->block_address.address + i +
+                    gpe_block->register_count;
 
                 this_register->status_address.space_id =
                     gpe_block->block_address.space_id;
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 6374d8be88e0..6f2e69ca014a 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -104,9 +104,7 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
                         status = AE_NO_MEMORY;
                         goto cleanup;
                 }
-#if ACPI_MACHINE_WIDTH != 16
                 return_desc->integer.value = acpi_os_get_timer();
-#endif
                 break;
 
         default:                /*  Unknown opcode  */
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 496744774859..c6819e015e2a 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -209,11 +209,10 @@ acpi_ex_system_memory_space_handler(u32 function,
                         *value = (acpi_integer) ACPI_GET32(logical_addr_ptr);
                         break;
 
-#if ACPI_MACHINE_WIDTH != 16
                 case 64:
                         *value = (acpi_integer) ACPI_GET64(logical_addr_ptr);
                         break;
-#endif
+
                 default:
                         /* bit_width was already validated */
                         break;
@@ -235,11 +234,9 @@ acpi_ex_system_memory_space_handler(u32 function,
                         ACPI_SET32(logical_addr_ptr) = (u32) * value;
                         break;
 
-#if ACPI_MACHINE_WIDTH != 16
                 case 64:
                         ACPI_SET64(logical_addr_ptr) = (u64) * value;
                         break;
-#endif
 
                 default:
                         /* bit_width was already validated */
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index 716e4aeca1e1..5b19fc75cbd0 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -788,8 +788,8 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
 
         case ACPI_ADR_SPACE_SYSTEM_IO:
 
-                status = acpi_os_read_port((acpi_io_address) address,
-                                           value, width);
+                status =
+                    acpi_os_read_port((acpi_io_address) address, value, width);
                 break;
 
         default:
@@ -800,8 +800,7 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
 
         ACPI_DEBUG_PRINT((ACPI_DB_IO,
                           "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
-                          *value, width,
-                          ACPI_FORMAT_UINT64(address),
+                          *value, width, ACPI_FORMAT_UINT64(address),
                           acpi_ut_get_region_name(reg->space_id)));
 
         return (status);
@@ -858,8 +857,8 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
 
         case ACPI_ADR_SPACE_SYSTEM_IO:
 
-                status = acpi_os_write_port((acpi_io_address) address,
-                                            value, width);
+                status = acpi_os_write_port((acpi_io_address) address, value,
+                                            width);
                 break;
 
         default:
@@ -870,8 +869,7 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
 
         ACPI_DEBUG_PRINT((ACPI_DB_IO,
                           "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
-                          value, width,
-                          ACPI_FORMAT_UINT64(address),
+                          value, width, ACPI_FORMAT_UINT64(address),
                           acpi_ut_get_region_name(reg->space_id)));
 
         return (status);
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index 5c6e88251c1a..82c0b66f1f21 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -98,8 +98,6 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
         return (AE_OK);
 }
 
-#if ACPI_MACHINE_WIDTH != 16
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_tb_find_rsdp
@@ -275,5 +273,3 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
                           start_address));
         return_PTR(NULL);
 }
-
-#endif