Merge tag 'of-graph-drm-2015-04-08' of git://git.pengutronix.de/git/pza/linux into drm-next
drm: Use of-graph helpers to loop over endpoints Convert all drm callers that use of_graph_get_next_endpoint to loop over of-graph endpoints to the newly introduced for_each_endpoint_of_node helper macro. * tag 'of-graph-drm-2015-04-08' of git://git.pengutronix.de/git/pza/linux: drm/rockchip: use for_each_endpoint_of_node macro, drop endpoint reference on break drm/rcar-du: use for_each_endpoint_of_node macro drm/imx: use for_each_endpoint_of_node macro in imx_drm_encoder_get_mux_id drm: use for_each_endpoint_of_node macro in drm_of_find_possible_crtcs of: Explicitly include linux/types.h in of_graph.h dt-bindings: brcm: rationalize Broadcom documentation naming of/unittest: replace 'selftest' with 'unittest' Documentation: rename of_selftest.txt to of_unittest.txt Documentation: update the of_selftest.txt dt: OF_UNITTEST make dependency broken MAINTAINERS: Pantelis Antoniou device tree overlay maintainer of: Add of_graph_get_port_by_id function of: Add for_each_endpoint_of_node helper macro of: Decrement refcount of previous endpoint in of_graph_get_next_endpoint
This commit is contained in:
@@ -385,7 +385,7 @@ static const struct dev_pm_ops rockchip_drm_pm_ops = {
|
||||
int rockchip_drm_encoder_get_mux_id(struct device_node *node,
|
||||
struct drm_encoder *encoder)
|
||||
{
|
||||
struct device_node *ep = NULL;
|
||||
struct device_node *ep;
|
||||
struct drm_crtc *crtc = encoder->crtc;
|
||||
struct of_endpoint endpoint;
|
||||
struct device_node *port;
|
||||
@@ -394,18 +394,15 @@ int rockchip_drm_encoder_get_mux_id(struct device_node *node,
|
||||
if (!node || !crtc)
|
||||
return -EINVAL;
|
||||
|
||||
do {
|
||||
ep = of_graph_get_next_endpoint(node, ep);
|
||||
if (!ep)
|
||||
break;
|
||||
|
||||
for_each_endpoint_of_node(node, ep) {
|
||||
port = of_graph_get_remote_port(ep);
|
||||
of_node_put(port);
|
||||
if (port == crtc->port) {
|
||||
ret = of_graph_parse_endpoint(ep, &endpoint);
|
||||
of_node_put(ep);
|
||||
return ret ?: endpoint.id;
|
||||
}
|
||||
} while (ep);
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user