tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'devprop-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Browse Source 
Pull device properties framework updates from Rafael Wysocki:
 "These improve the handling of secondary firmware nodes in
  fwnode_graph_get_next_endpoint() (Daniel Scally)"

* tag 'devprop-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "media: device property: Call fwnode_graph_get_endpoint_by_id() for fwnode->secondary"
  device property: Check fwnode->secondary in fwnode_graph_get_next_endpoint()
This commit is contained in:
Linus Torvalds
2021-08-31 13:36:01 -07:00
parent 6f1e8b12ee a908877056
commit 8e235ff9a1
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/base/property.c
+21 -9
View File
@@ -1033,7 +1033,26 @@ struct fwnode_handle *
fwnode_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
struct fwnode_handle *prev)
{
return fwnode_call_ptr_op(fwnode, graph_get_next_endpoint, prev);
const struct fwnode_handle *parent;
struct fwnode_handle *ep;
/*
* If this function is in a loop and the previous iteration returned
* an endpoint from fwnode->secondary, then we need to use the secondary
* as parent rather than @fwnode.
*/
if (prev)
parent = fwnode_graph_get_port_parent(prev);
else
parent = fwnode;
ep = fwnode_call_ptr_op(parent, graph_get_next_endpoint, prev);
if (IS_ERR_OR_NULL(ep) &&
!IS_ERR_OR_NULL(parent) && !IS_ERR_OR_NULL(parent->secondary))
ep = fwnode_graph_get_next_endpoint(parent->secondary, NULL);
return ep;
}
EXPORT_SYMBOL_GPL(fwnode_graph_get_next_endpoint);
@@ -1212,14 +1231,7 @@ fwnode_graph_get_endpoint_by_id(const struct fwnode_handle *fwnode,
best_ep_id = fwnode_ep.id;
}
if (best_ep)
return best_ep;
if (fwnode && !IS_ERR_OR_NULL(fwnode->secondary))
return fwnode_graph_get_endpoint_by_id(fwnode->secondary, port,
endpoint, flags);
return NULL;
return best_ep;
}
EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);