drm/rockchip: use for_each_endpoint_of_node macro, drop endpoint reference on break

Using the for_each_... macro should make the code a bit shorter and
easier to read. Also, when breaking out of the loop, the endpoint node
reference count needs to be decremented.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
This commit is contained in:
Philipp Zabel 2014-12-21 15:38:02 +01:00
parent 4af642d5bf
commit ecaa490222
1 changed files with 4 additions and 7 deletions

View File

@ -366,7 +366,7 @@ static const struct dev_pm_ops rockchip_drm_pm_ops = {
int rockchip_drm_encoder_get_mux_id(struct device_node *node, int rockchip_drm_encoder_get_mux_id(struct device_node *node,
struct drm_encoder *encoder) struct drm_encoder *encoder)
{ {
struct device_node *ep = NULL; struct device_node *ep;
struct drm_crtc *crtc = encoder->crtc; struct drm_crtc *crtc = encoder->crtc;
struct of_endpoint endpoint; struct of_endpoint endpoint;
struct device_node *port; struct device_node *port;
@ -375,18 +375,15 @@ int rockchip_drm_encoder_get_mux_id(struct device_node *node,
if (!node || !crtc) if (!node || !crtc)
return -EINVAL; return -EINVAL;
do { for_each_endpoint_of_node(node, ep) {
ep = of_graph_get_next_endpoint(node, ep);
if (!ep)
break;
port = of_graph_get_remote_port(ep); port = of_graph_get_remote_port(ep);
of_node_put(port); of_node_put(port);
if (port == crtc->port) { if (port == crtc->port) {
ret = of_graph_parse_endpoint(ep, &endpoint); ret = of_graph_parse_endpoint(ep, &endpoint);
of_node_put(ep);
return ret ?: endpoint.id; return ret ?: endpoint.id;
} }
} while (ep); }
return -EINVAL; return -EINVAL;
} }