Commit 114dbb4f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

drivers property: When no children in primary, try secondary

Software firmware nodes can provide a child node to its parent.
Since software node can be secondary, we need a mechanism to access
the children. The idea is to list children of the primary node first
and when they are finished, continue with secondary node if available.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20200520102959.34812-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c82c83c3
...@@ -708,14 +708,23 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev, ...@@ -708,14 +708,23 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev,
struct fwnode_handle *child) struct fwnode_handle *child)
{ {
struct acpi_device *adev = ACPI_COMPANION(dev); struct acpi_device *adev = ACPI_COMPANION(dev);
struct fwnode_handle *fwnode = NULL; struct fwnode_handle *fwnode = NULL, *next;
if (dev->of_node) if (dev->of_node)
fwnode = &dev->of_node->fwnode; fwnode = &dev->of_node->fwnode;
else if (adev) else if (adev)
fwnode = acpi_fwnode_handle(adev); fwnode = acpi_fwnode_handle(adev);
return fwnode_get_next_child_node(fwnode, child); /* Try to find a child in primary fwnode */
next = fwnode_get_next_child_node(fwnode, child);
if (next)
return next;
/* When no more children in primary, continue with secondary */
if (!IS_ERR_OR_NULL(fwnode->secondary))
next = fwnode_get_next_child_node(fwnode->secondary, child);
return next;
} }
EXPORT_SYMBOL_GPL(device_get_next_child_node); EXPORT_SYMBOL_GPL(device_get_next_child_node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment