]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ACPI: property: Use ACPI functions in acpi_graph_get_next_endpoint() only
authorSakari Ailus <sakari.ailus@linux.intel.com>
Wed, 1 Oct 2025 10:43:19 +0000 (13:43 +0300)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 22 Oct 2025 14:57:00 +0000 (16:57 +0200)
Calling fwnode_get_next_child_node() in ACPI implementation of the fwnode
property API is somewhat problematic as the latter is used in the
impelementation of the former. Instead of using
fwnode_get_next_child_node() in acpi_graph_get_next_endpoint(), call
acpi_get_next_subnode() directly instead.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Link: https://patch.msgid.link/20251001104320.1272752-3-sakari.ailus@linux.intel.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/property.c

index dbf86bee62e1d1a503c376d37222ba7513fa583f..b88bad197fca931fc80a549d0b85b6460d25b270 100644 (file)
@@ -1473,7 +1473,7 @@ static struct fwnode_handle *acpi_graph_get_next_endpoint(
 
        if (!prev) {
                do {
-                       port = fwnode_get_next_child_node(fwnode, port);
+                       port = acpi_get_next_subnode(fwnode, port);
                        /*
                         * The names of the port nodes begin with "port@"
                         * followed by the number of the port node and they also
@@ -1491,13 +1491,13 @@ static struct fwnode_handle *acpi_graph_get_next_endpoint(
        if (!port)
                return NULL;
 
-       endpoint = fwnode_get_next_child_node(port, prev);
+       endpoint = acpi_get_next_subnode(port, prev);
        while (!endpoint) {
-               port = fwnode_get_next_child_node(fwnode, port);
+               port = acpi_get_next_subnode(fwnode, port);
                if (!port)
                        break;
                if (is_acpi_graph_node(port, "port"))
-                       endpoint = fwnode_get_next_child_node(port, NULL);
+                       endpoint = acpi_get_next_subnode(port, NULL);
        }
 
        /*