Commit 8e235ff9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 6f1e8b12 a9088770

drivers/base/property.c

+21 −9
Original line number Diff line number Diff line
@@ -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;

}

EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);