ACPICA: iASL: Cleanup/optimization for ToPLD macro support

ACPICA commit 0e6125401cf38427d5376f4bafbfb3d5a40f8467

Use local variables for access to string/value Op fields.
Move duplicate PLD string tables to a single common table.

Link: https://github.com/acpica/acpica/commit/0e612540
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 51b073b68f161799119af908957b1254d7c68781..54b42a57118e0729fdf2d9135f11aa12b6203712 100644 (file)
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -361,6 +361,15 @@ ACPI_GLOBAL(u32, acpi_gbl_num_objects);
 
 #endif                         /* ACPI_DEBUGGER */
 
+#if defined (ACPI_DISASSEMBLER) || defined (ACPI_ASL_COMPILER)
+
+ACPI_GLOBAL(const char, *acpi_gbl_pld_panel_list[]);
+ACPI_GLOBAL(const char, *acpi_gbl_pld_vertical_position_list[]);
+ACPI_GLOBAL(const char, *acpi_gbl_pld_horizontal_position_list[]);
+ACPI_GLOBAL(const char, *acpi_gbl_pld_shape_list[]);
+
+#endif
+
 /*****************************************************************************
  *
  * Application globals

diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 48fffcfe9911547edaba7d016bf01f8baff32f9e..d45899c17d4ec3a13adead0d158be17512f39e94 100644 (file)
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -221,6 +221,49 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
 };
 #endif                         /* !ACPI_REDUCED_HARDWARE */
 
+#if defined (ACPI_DISASSEMBLER) || defined (ACPI_ASL_COMPILER)
+
+/* to_pld macro: compile/disassemble strings */
+
+const char *acpi_gbl_pld_panel_list[] = {
+       "TOP",
+       "BOTTOM",
+       "LEFT",
+       "RIGHT",
+       "FRONT",
+       "BACK",
+       "UNKNOWN",
+       NULL
+};
+
+const char *acpi_gbl_pld_vertical_position_list[] = {
+       "UPPER",
+       "CENTER",
+       "LOWER",
+       NULL
+};
+
+const char *acpi_gbl_pld_horizontal_position_list[] = {
+       "LEFT",
+       "CENTER",
+       "RIGHT",
+       NULL
+};
+
+const char *acpi_gbl_pld_shape_list[] = {
+       "ROUND",
+       "OVAL",
+       "SQUARE",
+       "VERTICALRECTANGLE",
+       "HORIZONTALRECTANGLE",
+       "VERTICALTRAPEZOID",
+       "HORIZONTALTRAPEZOID",
+       "UNKNOWN",
+       "CHAMFERED",
+       NULL
+};
+#endif
+
 /* Public globals */
 
 ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)