ACPICA: Parser: Add constants for internal namepath function

ACPICA commit b216e39fe85feee955d29fe0a7190dd811e181ea

Add true/false constants for the "PossibleMethodCall" parameter
for acpi_ps_get_next_namepath.

Link: https://github.com/acpica/acpica/commit/b216e39f
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>

diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 8fc8c7cea87963ceb40c8a3184290ebe23b0d331..96d510a7feba1d05da7b0cf845de300cc273c6bb 100644 (file)
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -92,7 +92,13 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
 acpi_status
 acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
                          struct acpi_parse_state *parser_state,
-                         union acpi_parse_object *arg, u8 method_call);
+                         union acpi_parse_object *arg,
+                         u8 possible_method_call);
+
+/* Values for u8 above */
+
+#define ACPI_NOT_METHOD_CALL            FALSE
+#define ACPI_POSSIBLE_METHOD_CALL       TRUE
 
 acpi_status
 acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,

diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index 3f0ffeef41370206da6d0d0ecf8cc4a12e73119c..0fdb7fc4824a2f8246a426cff877ae6d0d32190d 100644 (file)
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -821,7 +821,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
                                status =
                                    acpi_ps_get_next_namepath(walk_state,
                                                              parser_state, arg,
-                                                             1);
+                                                             ACPI_POSSIBLE_METHOD_CALL);
 
                                /*
                                 * If the super_name arg of Unload is a method call,
@@ -836,7 +836,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
                                status =
                                    acpi_ps_get_next_namepath(walk_state,
                                                              parser_state, arg,
-                                                             0);
+                                                             ACPI_NOT_METHOD_CALL);
                        }
                } else {
                        /* Single complex argument, nothing returned */

diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index c660006f13eed945bbc790a55e8f6038e46ebc50..a57f473bac83006b8cba99cbe86ac5ab390e3242 100644 (file)
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -109,10 +109,10 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
 
        case AML_INT_NAMEPATH_OP:       /* AML_NAMESTRING_ARG */
 
-               status =
-                   acpi_ps_get_next_namepath(walk_state,
-                                             &(walk_state->parser_state), op,
-                                             1);
+               status = acpi_ps_get_next_namepath(walk_state,
+                                                  &(walk_state->parser_state),
+                                                  op,
+                                                  ACPI_POSSIBLE_METHOD_CALL);
                if (ACPI_FAILURE(status)) {
                        return_ACPI_STATUS(status);
                }