hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bob Moore 2018-03-14 16:13:06 -07:00 committed by Rafael J. Wysocki
parent 0fe0bebf5f
commit e7d970f6fc
8 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/acpica/evrgnini.c
View File

@ -562,7 +562,7 @@ acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj)
* *
* See acpi_ns_exec_module_code * See acpi_ns_exec_module_code
*/ */
if (!acpi_gbl_parse_table_as_term_list && if (!acpi_gbl_execute_tables_as_methods &&
obj_desc->method. obj_desc->method.
info_flags & ACPI_METHOD_MODULE_LEVEL) { info_flags & ACPI_METHOD_MODULE_LEVEL) {
handler_obj = handler_obj =

2
drivers/acpi/acpica/nsload.c
View File

@ -157,7 +157,7 @@ unlock:
* other ACPI implementations. Optionally, the execution can be deferred * other ACPI implementations. Optionally, the execution can be deferred
* until later, see acpi_initialize_objects. * 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_gbl_group_module_level_code) {
acpi_ns_exec_module_code_list(); acpi_ns_exec_module_code_list();
} }

2
drivers/acpi/acpica/nsparse.c
View File

@ -266,7 +266,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
ACPI_FUNCTION_TRACE(ns_parse_table); 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, ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE,
"%s: **** Start table execution pass\n", "%s: **** Start table execution pass\n",
ACPI_GET_FUNCTION_NAME)); ACPI_GET_FUNCTION_NAME));

2
drivers/acpi/acpica/tbdata.c
View File

@ -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 */ /* 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_gbl_group_module_level_code) {
acpi_ns_exec_module_code_list(); acpi_ns_exec_module_code_list();
} }

2
drivers/acpi/acpica/tbxfload.c
View File

@ -103,7 +103,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_load_tables(void)
"While loading namespace from ACPI tables")); "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) { || !acpi_gbl_group_module_level_code) {
/* /*
* Initialize the objects that remain uninitialized. This * Initialize the objects that remain uninitialized. This

2
drivers/acpi/acpica/utxfinit.c
View File

@ -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 * 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. * 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_gbl_group_module_level_code) {
acpi_ns_exec_module_code_list(); acpi_ns_exec_module_code_list();

6
drivers/acpi/bus.c
View File

@ -68,7 +68,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
#endif #endif
static int set_gbl_term_list(const struct dmi_system_id *id) 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; return 0;
} }
@ -1077,7 +1077,7 @@ void __init acpi_early_init(void)
goto error0; goto error0;
} }
if (!acpi_gbl_parse_table_as_term_list && if (!acpi_gbl_execute_tables_as_methods &&
acpi_gbl_group_module_level_code) { acpi_gbl_group_module_level_code) {
status = acpi_load_tables(); status = acpi_load_tables();
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
@ -1167,7 +1167,7 @@ static int __init acpi_bus_init(void)
status = acpi_ec_ecdt_probe(); status = acpi_ec_ecdt_probe();
/* Ignore result. Not having an ECDT is not fatal. */ /* 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) { !acpi_gbl_group_module_level_code) {
status = acpi_load_tables(); status = acpi_load_tables();
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {

7
include/acpi/acpixf.h
View File

@ -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); ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, FALSE);
/* /*
* Optionally support module level code by parsing the entire table as * Optionally support module level code by parsing an entire table as
* a term_list. Default is FALSE, do not execute entire table until some * a method as it is loaded. Default is TRUE.
* lock order issues are fixed.
* NOTE, this is essentially obsolete and will be removed soon * NOTE, this is essentially obsolete and will be removed soon
* (01/2018). * (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 * Optionally use 32-bit FADT addresses if and when there is a conflict