diff options
Diffstat (limited to 'drivers/acpi/acpica/dswload.c')
-rw-r--r-- | drivers/acpi/acpica/dswload.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c index 6e17c0e24e63..95e681a36f9c 100644 --- a/drivers/acpi/acpica/dswload.c +++ b/drivers/acpi/acpica/dswload.c | |||
@@ -74,6 +74,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number) | |||
74 | 74 | ||
75 | switch (pass_number) { | 75 | switch (pass_number) { |
76 | case 1: | 76 | case 1: |
77 | |||
77 | walk_state->parse_flags = ACPI_PARSE_LOAD_PASS1 | | 78 | walk_state->parse_flags = ACPI_PARSE_LOAD_PASS1 | |
78 | ACPI_PARSE_DELETE_TREE; | 79 | ACPI_PARSE_DELETE_TREE; |
79 | walk_state->descending_callback = acpi_ds_load1_begin_op; | 80 | walk_state->descending_callback = acpi_ds_load1_begin_op; |
@@ -81,6 +82,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number) | |||
81 | break; | 82 | break; |
82 | 83 | ||
83 | case 2: | 84 | case 2: |
85 | |||
84 | walk_state->parse_flags = ACPI_PARSE_LOAD_PASS1 | | 86 | walk_state->parse_flags = ACPI_PARSE_LOAD_PASS1 | |
85 | ACPI_PARSE_DELETE_TREE; | 87 | ACPI_PARSE_DELETE_TREE; |
86 | walk_state->descending_callback = acpi_ds_load2_begin_op; | 88 | walk_state->descending_callback = acpi_ds_load2_begin_op; |
@@ -88,6 +90,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number) | |||
88 | break; | 90 | break; |
89 | 91 | ||
90 | case 3: | 92 | case 3: |
93 | |||
91 | #ifndef ACPI_NO_METHOD_EXECUTION | 94 | #ifndef ACPI_NO_METHOD_EXECUTION |
92 | walk_state->parse_flags |= ACPI_PARSE_EXECUTE | | 95 | walk_state->parse_flags |= ACPI_PARSE_EXECUTE | |
93 | ACPI_PARSE_DELETE_TREE; | 96 | ACPI_PARSE_DELETE_TREE; |
@@ -97,6 +100,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number) | |||
97 | break; | 100 | break; |
98 | 101 | ||
99 | default: | 102 | default: |
103 | |||
100 | return (AE_BAD_PARAMETER); | 104 | return (AE_BAD_PARAMETER); |
101 | } | 105 | } |
102 | 106 | ||
@@ -161,7 +165,6 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state, | |||
161 | 165 | ||
162 | switch (walk_state->opcode) { | 166 | switch (walk_state->opcode) { |
163 | case AML_SCOPE_OP: | 167 | case AML_SCOPE_OP: |
164 | |||
165 | /* | 168 | /* |
166 | * The target name of the Scope() operator must exist at this point so | 169 | * The target name of the Scope() operator must exist at this point so |
167 | * that we can actually open the scope to enter new names underneath it. | 170 | * that we can actually open the scope to enter new names underneath it. |
@@ -210,7 +213,6 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state, | |||
210 | case ACPI_TYPE_INTEGER: | 213 | case ACPI_TYPE_INTEGER: |
211 | case ACPI_TYPE_STRING: | 214 | case ACPI_TYPE_STRING: |
212 | case ACPI_TYPE_BUFFER: | 215 | case ACPI_TYPE_BUFFER: |
213 | |||
214 | /* | 216 | /* |
215 | * These types we will allow, but we will change the type. | 217 | * These types we will allow, but we will change the type. |
216 | * This enables some existing code of the form: | 218 | * This enables some existing code of the form: |
@@ -232,7 +234,6 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state, | |||
232 | break; | 234 | break; |
233 | 235 | ||
234 | case ACPI_TYPE_METHOD: | 236 | case ACPI_TYPE_METHOD: |
235 | |||
236 | /* | 237 | /* |
237 | * Allow scope change to root during execution of module-level | 238 | * Allow scope change to root during execution of module-level |
238 | * code. Root is typed METHOD during this time. | 239 | * code. Root is typed METHOD during this time. |