Commit d9f866b2 authored by Sakari Ailus's avatar Sakari Ailus Committed by Rafael J. Wysocki
Browse files

ACPI: property: Return present device nodes only on fwnode interface 



fwnode_graph_get_next_subnode() may return fwnode backed by ACPI
device nodes and there has been no check these devices are present
in the system, unlike there has been on fwnode OF backend.

In order to provide consistent behaviour towards callers,
add a check for device presence by introducing
a new function acpi_get_next_present_subnode(), used as the
get_next_child_node() fwnode operation that also checks device
node presence.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Link: https://patch.msgid.link/20251001102636.1272722-2-sakari.ailus@linux.intel.com


[ rjw: Kerneldoc comment and changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0f83b1d4

drivers/acpi/property.c

+23 −1
Original line number Diff line number Diff line
@@ -1358,6 +1358,28 @@ struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode, 
	return NULL;

}



/*

 * acpi_get_next_present_subnode - Return the next present child node handle

 * @fwnode: Firmware node to find the next child node for.

 * @child: Handle to one of the device's child nodes or a null handle.

 *

 * Like acpi_get_next_subnode(), but the device nodes returned by

 * acpi_get_next_present_subnode() are guaranteed to be present.

 *

 * Returns: The fwnode handle of the next present sub-node.

 */

static struct fwnode_handle *

acpi_get_next_present_subnode(const struct fwnode_handle *fwnode,

			      struct fwnode_handle *child)

{

	do {

		child = acpi_get_next_subnode(fwnode, child);

	} while (is_acpi_device_node(child) &&

		 !acpi_device_is_present(to_acpi_device_node(child)));



	return child;

}



/**

 * acpi_node_get_parent - Return parent fwnode of this fwnode

 * @fwnode: Firmware node whose parent to get
@@ -1702,7 +1724,7 @@ static int acpi_fwnode_irq_get(const struct fwnode_handle *fwnode, 
		.property_read_string_array =				\

			acpi_fwnode_property_read_string_array,		\

		.get_parent = acpi_node_get_parent,			\

		.get_next_child_node = acpi_get_next_subnode,		\

		.get_next_child_node = acpi_get_next_present_subnode,	\

		.get_named_child_node = acpi_fwnode_get_named_child_node, \

		.get_name = acpi_fwnode_get_name,			\

		.get_name_prefix = acpi_fwnode_get_name_prefix,		\