iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Device properties framework updates for 5.15-rc1

Browse Source 
Improve secondary firmware nodes handling in
 fwnode_graph_get_next_endpoint() (Daniel Scally).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmEtI+0SHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxcL4QAKNMT3O4IJp41NEghT5k3amkVpJsXy91
 RNKGNJM4ov178VoXWBj7ZWtzpdxEnh1R0idnTuR9BG1o3UbXAUnOrXHlS//uWzv7
 0PCR+pa/jKSWmyH0I8sjVpz3I2z15DUSIY9isIPrLF8mS8Ii+whw5BJDofklweA6
 EmEz52Gm1lP6gEF/6zsto0yJggHwWqhXtUpg8P1YB7NKN7AQ8CXYzthHcmQ+c7dP
 jRvCVtRY5f4whvgkqfmcDzQsIe96CphTw1tdvO8iaDWIfwzbcV8UjMrHSgDHw5QD
 BrrwqGKdO++bYSx8SJR3d6BMbN5UOkl/bTdWgIEaueiI3QFc7mrXf7W9uSA5CJKa
 FFFyLa8osnuLcQ7AwNxYxJ1KWVSWPdAWi8ihKhfYkChLCwlSUjysk9s/gYvt2P+y
 YDwybZwCO/0OFPi7YM2Dl/rBUlXT4Jz6Dcpvjj58Ram81Vq6hlC0g0IPHWigjbzv
 ox2nFcnXL35nsYnuFWpY2azPZX9UpDCPruIKmzP9y369QtcTkPTCAM1WMJya5Eqk
 2/Pp/Wa8C6/obeoOatIe4AVpNEPhcFbxixulJoai2MGGf80GKwY+Ec7mKZ3NZA/0
 j/PZodWwF0dm2MzjGZkykfGhlqdJfvh8lWBehv5N3Fk+c30AhwrSXquUaOomwYOn
 fkgxL1qChNl9
 =pc2K
 -----END PGP SIGNATURE-----

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

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
commit 8e235ff9a1
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/base/property.c
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);