Skip to content

Commit e7d970f

Browse files
acpibobrafaeljw
authored andcommitted
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 <[email protected]> Signed-off-by: Erik Schmauss <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 0fe0beb commit e7d970f

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

drivers/acpi/acpica/evrgnini.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj)
562562
*
563563
* See acpi_ns_exec_module_code
564564
*/
565-
if (!acpi_gbl_parse_table_as_term_list &&
565+
if (!acpi_gbl_execute_tables_as_methods &&
566566
obj_desc->method.
567567
info_flags & ACPI_METHOD_MODULE_LEVEL) {
568568
handler_obj =

drivers/acpi/acpica/nsload.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
157157
* other ACPI implementations. Optionally, the execution can be deferred
158158
* until later, see acpi_initialize_objects.
159159
*/
160-
if (!acpi_gbl_parse_table_as_term_list
160+
if (!acpi_gbl_execute_tables_as_methods
161161
&& !acpi_gbl_group_module_level_code) {
162162
acpi_ns_exec_module_code_list();
163163
}

drivers/acpi/acpica/nsparse.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
266266

267267
ACPI_FUNCTION_TRACE(ns_parse_table);
268268

269-
if (acpi_gbl_parse_table_as_term_list) {
269+
if (acpi_gbl_execute_tables_as_methods) {
270270
ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE,
271271
"%s: **** Start table execution pass\n",
272272
ACPI_GET_FUNCTION_NAME));

drivers/acpi/acpica/tbdata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node)
968968

969969
/* Execute any module-level code that was found in the table */
970970

971-
if (!acpi_gbl_parse_table_as_term_list
971+
if (!acpi_gbl_execute_tables_as_methods
972972
&& acpi_gbl_group_module_level_code) {
973973
acpi_ns_exec_module_code_list();
974974
}

drivers/acpi/acpica/tbxfload.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_load_tables(void)
103103
"While loading namespace from ACPI tables"));
104104
}
105105

106-
if (acpi_gbl_parse_table_as_term_list
106+
if (acpi_gbl_execute_tables_as_methods
107107
|| !acpi_gbl_group_module_level_code) {
108108
/*
109109
* Initialize the objects that remain uninitialized. This

drivers/acpi/acpica/utxfinit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_initialize_objects(u32 flags)
265265
* all of the tables have been loaded. It is a legacy option and is
266266
* not compatible with other ACPI implementations. See acpi_ns_load_table.
267267
*/
268-
if (!acpi_gbl_parse_table_as_term_list
268+
if (!acpi_gbl_execute_tables_as_methods
269269
&& acpi_gbl_group_module_level_code) {
270270
acpi_ns_exec_module_code_list();
271271

drivers/acpi/bus.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
6868
#endif
6969
static int set_gbl_term_list(const struct dmi_system_id *id)
7070
{
71-
acpi_gbl_parse_table_as_term_list = 1;
71+
acpi_gbl_execute_tables_as_methods = 1;
7272
return 0;
7373
}
7474

@@ -1077,7 +1077,7 @@ void __init acpi_early_init(void)
10771077
goto error0;
10781078
}
10791079

1080-
if (!acpi_gbl_parse_table_as_term_list &&
1080+
if (!acpi_gbl_execute_tables_as_methods &&
10811081
acpi_gbl_group_module_level_code) {
10821082
status = acpi_load_tables();
10831083
if (ACPI_FAILURE(status)) {
@@ -1167,7 +1167,7 @@ static int __init acpi_bus_init(void)
11671167
status = acpi_ec_ecdt_probe();
11681168
/* Ignore result. Not having an ECDT is not fatal. */
11691169

1170-
if (acpi_gbl_parse_table_as_term_list ||
1170+
if (acpi_gbl_execute_tables_as_methods ||
11711171
!acpi_gbl_group_module_level_code) {
11721172
status = acpi_load_tables();
11731173
if (ACPI_FAILURE(status)) {

include/acpi/acpixf.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,12 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE);
198198
ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, FALSE);
199199

200200
/*
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.
204203
* NOTE, this is essentially obsolete and will be removed soon
205204
* (01/2018).
206205
*/
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);
208207

209208
/*
210209
* Optionally use 32-bit FADT addresses if and when there is a conflict

0 commit comments

Comments
 (0)