ACPICA: Revert "Parser: Fix for SuperName method invocation"
ACPICA commit eade8f78f2aa21e8eabc3380a5728db47273bcf1 Revert commitae90fbf562
(ACPICA: Parser: Fix for SuperName method invocation). Support for method invocations as part of super_name will be removed from the ACPI specification, since no AML interpreter supports it. Fixes:ae90fbf562
(ACPICA: Parser: Fix for SuperName method invocation) Link: https://github.com/acpica/acpica/commit/eade8f78 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
f6cede5b49
commit
0dda8851a8
1 changed files with 4 additions and 5 deletions
|
@ -269,8 +269,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
|
||||||
*/
|
*/
|
||||||
if (ACPI_SUCCESS(status) &&
|
if (ACPI_SUCCESS(status) &&
|
||||||
possible_method_call && (node->type == ACPI_TYPE_METHOD)) {
|
possible_method_call && (node->type == ACPI_TYPE_METHOD)) {
|
||||||
if (GET_CURRENT_ARG_TYPE(walk_state->arg_types) ==
|
if (walk_state->opcode == AML_UNLOAD_OP) {
|
||||||
ARGP_SUPERNAME) {
|
|
||||||
/*
|
/*
|
||||||
* acpi_ps_get_next_namestring has increased the AML pointer,
|
* acpi_ps_get_next_namestring has increased the AML pointer,
|
||||||
* so we need to restore the saved AML pointer for method call.
|
* so we need to restore the saved AML pointer for method call.
|
||||||
|
@ -697,7 +696,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
|
||||||
*
|
*
|
||||||
* PARAMETERS: walk_state - Current state
|
* PARAMETERS: walk_state - Current state
|
||||||
* parser_state - Current parser state object
|
* parser_state - Current parser state object
|
||||||
* arg_type - The parser argument type (ARGP_*)
|
* arg_type - The argument type (AML_*_ARG)
|
||||||
* return_arg - Where the next arg is returned
|
* return_arg - Where the next arg is returned
|
||||||
*
|
*
|
||||||
* RETURN: Status, and an op object containing the next argument.
|
* RETURN: Status, and an op object containing the next argument.
|
||||||
|
@ -817,9 +816,9 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
|
||||||
return_ACPI_STATUS(AE_NO_MEMORY);
|
return_ACPI_STATUS(AE_NO_MEMORY);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* super_name allows argument to be a method call */
|
/* To support super_name arg of Unload */
|
||||||
|
|
||||||
if (arg_type == ARGP_SUPERNAME) {
|
if (walk_state->opcode == AML_UNLOAD_OP) {
|
||||||
status =
|
status =
|
||||||
acpi_ps_get_next_namepath(walk_state,
|
acpi_ps_get_next_namepath(walk_state,
|
||||||
parser_state, arg,
|
parser_state, arg,
|
||||||
|
|
Loading…
Reference in a new issue