Skip to content

Commit

Permalink
drm/rockchip: use for_each_endpoint_of_node macro, drop endpoint refe…
Browse files Browse the repository at this point in the history
…rence 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>
  • Loading branch information
Philipp Zabel committed Apr 8, 2015
1 parent 4af642d commit ecaa490
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/gpu/drm/rockchip/rockchip_drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
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;
Expand All @@ -375,18 +375,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;
}
Expand Down

0 comments on commit ecaa490

Please sign in to comment.