drivers property: When no children in primary, try secondary
Subsystems (2)
Andy Shevchenko
reviewerPATCH 1/1 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.
--- drivers/base/property.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/base/property.c +11 -2
@@ -708,14 +708,23 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev, struct fwnode_handle *child) {struct acpi_device *adev =ACPI_COMPANION (dev); -struct fwnode_handle *fwnode =NULL ; +struct fwnode_handle *fwnode =NULL , *next;if (dev->of_node) fwnode = &dev->of_node->fwnode;else if (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);
Signature · 1 line
2.26.2
Quoted 5 lines · Andy Shevchenko
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.
Makes sense.
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>
Greg, do you want me to apply it?
If you'd rather take it yourself, please feel free to add
Quoted 37 lines
--- drivers/base/property.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/base/property.c +11
-3@@ -708,14 +708,23 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev, struct fwnode_handle *child) {struct acpi_device *adev =ACPI_COMPANION (dev); -struct fwnode_handle *fwnode =NULL ; +struct fwnode_handle *fwnode =NULL , *next;if (dev->of_node) fwnode = &dev->of_node->fwnode;else if (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); --2.26.2
Greg Kroah-Hartman
maintainerQuoted 10 lines · Rafael J. Wysocki
Quoted 5 lines · Andy Shevchenko
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.
Makes sense.
Quoted 7 lines
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>Greg, do you want me to apply it?
If you'd rather take it yourself, please feel free to add
Reviewed-by Rafael J. Wysocki <[email protected]>
I can take it, there's other driver core patches in my tree already :)
thanks,
greg k-h
Thanks, Andy!
Quoted 6 lines · Andy Shevchenko
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 Andy Shevchenko <[email protected]>
Signature · 1 line
Sakari Ailus
Quoted 6 lines · Andy Shevchenko
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 Andy Shevchenko <[email protected]>
FWIW:
Quoted 23 lines
--- drivers/base/property.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/base/property.c +3
-2@@ -708,14 +708,23 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev, struct fwnode_handle *child) {struct acpi_device *adev =ACPI_COMPANION (dev); -struct fwnode_handle *fwnode =NULL ; +struct fwnode_handle *fwnode =NULL , *next;if (dev->of_node) fwnode = &dev->of_node->fwnode;else if (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);
drivers/base/property.c struct fwnode_handle *device_get_next_child_node(struct device *dev, · line 729
Quoted 10 lines
drivers/base/property.c +8
-0+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);
Thanks Andy,
Signature · 1 line
heikki