ACPICA: Rename a global for clarity, no functional change

Was acpi_gbl_parse_table_as_term_list, changed to:
acpi_gbl_execute_tables_as_methods.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 4187f563fede2f15a21798c854ff5117883856e0..ade127f26b483819ef9961ddd0cf675b96e0a1d0 100644 (file)
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -562,7 +562,7 @@ acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj)
                                 *
                                 * See acpi_ns_exec_module_code
                                 */
-                               if (!acpi_gbl_parse_table_as_term_list &&
+                               if (!acpi_gbl_execute_tables_as_methods &&
                                    obj_desc->method.
                                    info_flags & ACPI_METHOD_MODULE_LEVEL) {
                                        handler_obj =

diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index fdfe9309bd330c12d403a493243ef0e894e5a1cd..d3440af82e5493df762dbe345ed8594756f0b4f3 100644 (file)
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -157,7 +157,7 @@ unlock:
         * other ACPI implementations. Optionally, the execution can be deferred
         * until later, see acpi_initialize_objects.
         */
-       if (!acpi_gbl_parse_table_as_term_list
+       if (!acpi_gbl_execute_tables_as_methods
            && !acpi_gbl_group_module_level_code) {
                acpi_ns_exec_module_code_list();
        }

diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index acb1aede720ec70999c4e77ddfe0bace6c31a539..0036cec4e982c7386424b4c8b4e195a171b83850 100644 (file)
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -266,7 +266,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
 
        ACPI_FUNCTION_TRACE(ns_parse_table);
 
-       if (acpi_gbl_parse_table_as_term_list) {
+       if (acpi_gbl_execute_tables_as_methods) {
                ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE,
                                      "%s: **** Start table execution pass\n",
                                      ACPI_GET_FUNCTION_NAME));

diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c
index ec69267f1447a24aa7dd8e6bf952b2572e80aaad..5b59d419ebb7b82dbfdd2364b19167951f0f54b3 100644 (file)
--- a/drivers/acpi/acpica/tbdata.c
+++ b/drivers/acpi/acpica/tbdata.c
@@ -968,7 +968,7 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node)
 
        /* Execute any module-level code that was found in the table */
 
-       if (!acpi_gbl_parse_table_as_term_list
+       if (!acpi_gbl_execute_tables_as_methods
            && acpi_gbl_group_module_level_code) {
                acpi_ns_exec_module_code_list();
        }

diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index e09b4b26300e742508b7df951bda9fec6ae9d284..e49999e8542b3ead2de2a56422a56686fa74ad9c 100644 (file)
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -103,7 +103,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_load_tables(void)
                                "While loading namespace from ACPI tables"));
        }
 
-       if (acpi_gbl_parse_table_as_term_list
+       if (acpi_gbl_execute_tables_as_methods
            || !acpi_gbl_group_module_level_code) {
                /*
                 * Initialize the objects that remain uninitialized. This

diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index e727db52a55edda97d9553bf1134c3d5360714f1..0e62a915a3a78fc6605301b037bb3259e4eb8c77 100644 (file)
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -265,7 +265,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_initialize_objects(u32 flags)
         * all of the tables have been loaded. It is a legacy option and is
         * not compatible with other ACPI implementations. See acpi_ns_load_table.
         */
-       if (!acpi_gbl_parse_table_as_term_list
+       if (!acpi_gbl_execute_tables_as_methods
            && acpi_gbl_group_module_level_code) {
                acpi_ns_exec_module_code_list();
 

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 0dad0bd9327b5ac2338f0c8b1e4c021532a47196..84b4a62018eb1970e030535b1a7aa5d35b69b323 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -68,7 +68,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
 #endif
 static int set_gbl_term_list(const struct dmi_system_id *id)
 {
-       acpi_gbl_parse_table_as_term_list = 1;
+       acpi_gbl_execute_tables_as_methods = 1;
        return 0;
 }
 
@@ -1077,7 +1077,7 @@ void __init acpi_early_init(void)
                goto error0;
        }
 
-       if (!acpi_gbl_parse_table_as_term_list &&
+       if (!acpi_gbl_execute_tables_as_methods &&
            acpi_gbl_group_module_level_code) {
                status = acpi_load_tables();
                if (ACPI_FAILURE(status)) {
@@ -1167,7 +1167,7 @@ static int __init acpi_bus_init(void)
        status = acpi_ec_ecdt_probe();
        /* Ignore result. Not having an ECDT is not fatal. */
 
-       if (acpi_gbl_parse_table_as_term_list ||
+       if (acpi_gbl_execute_tables_as_methods ||
            !acpi_gbl_group_module_level_code) {
                status = acpi_load_tables();
                if (ACPI_FAILURE(status)) {

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index b8d42c5c42648ea8af8021ee1230a9acf5425f25..2b53a575a83ead58bd3c0684db942f414e516579 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -198,13 +198,12 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE);
 ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, FALSE);
 
 /*
- * Optionally support module level code by parsing the entire table as
- * a term_list. Default is FALSE, do not execute entire table until some
- * lock order issues are fixed.
+ * Optionally support module level code by parsing an entire table as
+ * a method as it is loaded. Default is TRUE.
  * NOTE, this is essentially obsolete and will be removed soon
  * (01/2018).
  */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_parse_table_as_term_list, TRUE);
+ACPI_INIT_GLOBAL(u8, acpi_gbl_execute_tables_as_methods, TRUE);
 
 /*
  * Optionally use 32-bit FADT addresses if and when there is a conflict