Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bob Moore and committed by
Rafael J. Wysocki
e7d970f6 0fe0bebf

+12 -13
+1 -1
drivers/acpi/acpica/evrgnini.c
··· 562 562 * 563 563 * See acpi_ns_exec_module_code 564 564 */ 565 - if (!acpi_gbl_parse_table_as_term_list && 565 + if (!acpi_gbl_execute_tables_as_methods && 566 566 obj_desc->method. 567 567 info_flags & ACPI_METHOD_MODULE_LEVEL) { 568 568 handler_obj =
+1 -1
drivers/acpi/acpica/nsload.c
··· 157 157 * other ACPI implementations. Optionally, the execution can be deferred 158 158 * until later, see acpi_initialize_objects. 159 159 */ 160 - if (!acpi_gbl_parse_table_as_term_list 160 + if (!acpi_gbl_execute_tables_as_methods 161 161 && !acpi_gbl_group_module_level_code) { 162 162 acpi_ns_exec_module_code_list(); 163 163 }
+1 -1
drivers/acpi/acpica/nsparse.c
··· 266 266 267 267 ACPI_FUNCTION_TRACE(ns_parse_table); 268 268 269 - if (acpi_gbl_parse_table_as_term_list) { 269 + if (acpi_gbl_execute_tables_as_methods) { 270 270 ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE, 271 271 "%s: **** Start table execution pass\n", 272 272 ACPI_GET_FUNCTION_NAME));
+1 -1
drivers/acpi/acpica/tbdata.c
··· 968 968 969 969 /* Execute any module-level code that was found in the table */ 970 970 971 - if (!acpi_gbl_parse_table_as_term_list 971 + if (!acpi_gbl_execute_tables_as_methods 972 972 && acpi_gbl_group_module_level_code) { 973 973 acpi_ns_exec_module_code_list(); 974 974 }
+1 -1
drivers/acpi/acpica/tbxfload.c
··· 103 103 "While loading namespace from ACPI tables")); 104 104 } 105 105 106 - if (acpi_gbl_parse_table_as_term_list 106 + if (acpi_gbl_execute_tables_as_methods 107 107 || !acpi_gbl_group_module_level_code) { 108 108 /* 109 109 * Initialize the objects that remain uninitialized. This
+1 -1
drivers/acpi/acpica/utxfinit.c
··· 265 265 * all of the tables have been loaded. It is a legacy option and is 266 266 * not compatible with other ACPI implementations. See acpi_ns_load_table. 267 267 */ 268 - if (!acpi_gbl_parse_table_as_term_list 268 + if (!acpi_gbl_execute_tables_as_methods 269 269 && acpi_gbl_group_module_level_code) { 270 270 acpi_ns_exec_module_code_list(); 271 271
+3 -3
drivers/acpi/bus.c
··· 68 68 #endif 69 69 static int set_gbl_term_list(const struct dmi_system_id *id) 70 70 { 71 - acpi_gbl_parse_table_as_term_list = 1; 71 + acpi_gbl_execute_tables_as_methods = 1; 72 72 return 0; 73 73 } 74 74 ··· 1077 1077 goto error0; 1078 1078 } 1079 1079 1080 - if (!acpi_gbl_parse_table_as_term_list && 1080 + if (!acpi_gbl_execute_tables_as_methods && 1081 1081 acpi_gbl_group_module_level_code) { 1082 1082 status = acpi_load_tables(); 1083 1083 if (ACPI_FAILURE(status)) { ··· 1167 1167 status = acpi_ec_ecdt_probe(); 1168 1168 /* Ignore result. Not having an ECDT is not fatal. */ 1169 1169 1170 - if (acpi_gbl_parse_table_as_term_list || 1170 + if (acpi_gbl_execute_tables_as_methods || 1171 1171 !acpi_gbl_group_module_level_code) { 1172 1172 status = acpi_load_tables(); 1173 1173 if (ACPI_FAILURE(status)) {
+3 -4
include/acpi/acpixf.h
··· 198 198 ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, FALSE); 199 199 200 200 /* 201 - * Optionally support module level code by parsing the entire table as 202 - * a term_list. Default is FALSE, do not execute entire table until some 203 - * lock order issues are fixed. 201 + * Optionally support module level code by parsing an entire table as 202 + * a method as it is loaded. Default is TRUE. 204 203 * NOTE, this is essentially obsolete and will be removed soon 205 204 * (01/2018). 206 205 */ 207 - ACPI_INIT_GLOBAL(u8, acpi_gbl_parse_table_as_term_list, TRUE); 206 + ACPI_INIT_GLOBAL(u8, acpi_gbl_execute_tables_as_methods, TRUE); 208 207 209 208 /* 210 209 * Optionally use 32-bit FADT addresses if and when there is a conflict