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

4 files changed, 15 insertions, 51 deletions

diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
index 16150a00c237..aaa130736bf8 100644
--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
@@ -43,14 +43,10 @@ static uint32_t drm_crtc_port_mask(struct drm_device *dev,
 uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
                                     struct device_node *port)
 {
-        struct device_node *remote_port, *ep = NULL;
+        struct device_node *remote_port, *ep;
         uint32_t possible_crtcs = 0;
 
-        do {
-                ep = of_graph_get_next_endpoint(port, ep);
-                if (!ep)
-                        break;
-
+        for_each_endpoint_of_node(port, ep) {
                 remote_port = of_graph_get_remote_port(ep);
                 if (!remote_port) {
                         of_node_put(ep);
@@ -60,7 +56,7 @@ uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
                 possible_crtcs |= drm_crtc_port_mask(dev, remote_port);
 
                 of_node_put(remote_port);
-        } while (1);
+        }
 
         return possible_crtcs;
 }
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index a002f53aab0e..db2f5a739e05 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -431,15 +431,6 @@ int imx_drm_encoder_parse_of(struct drm_device *drm,
 }
 EXPORT_SYMBOL_GPL(imx_drm_encoder_parse_of);
 
-static struct device_node *imx_drm_of_get_next_endpoint(
-                const struct device_node *parent, struct device_node *prev)
-{
-        struct device_node *node = of_graph_get_next_endpoint(parent, prev);
-
-        of_node_put(prev);
-        return node;
-}
-
 /*
  * @node: device tree node containing encoder input ports
  * @encoder: drm_encoder
@@ -448,7 +439,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node,
                                struct drm_encoder *encoder)
 {
         struct imx_drm_crtc *imx_crtc = imx_drm_find_crtc(encoder->crtc);
-        struct device_node *ep = NULL;
+        struct device_node *ep;
         struct of_endpoint endpoint;
         struct device_node *port;
         int ret;
@@ -456,18 +447,15 @@ int imx_drm_encoder_get_mux_id(struct device_node *node,
         if (!node || !imx_crtc)
                 return -EINVAL;
 
-        do {
-                ep = imx_drm_of_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 == imx_crtc->crtc->port) {
                         ret = of_graph_parse_endpoint(ep, &endpoint);
+                        of_node_put(ep);
                         return ret ? ret : endpoint.port;
                 }
-        } while (ep);
+        }
 
         return -EINVAL;
 }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index fb052bca574f..93117f159a3b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -509,7 +509,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
         enum rcar_du_encoder_type enc_type = RCAR_DU_ENCODER_NONE;
         struct device_node *connector = NULL;
         struct device_node *encoder = NULL;
-        struct device_node *prev = NULL;
+        struct device_node *ep_node = NULL;
         struct device_node *entity_ep_node;
         struct device_node *entity;
         int ret;
@@ -527,16 +527,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
 
         entity_ep_node = of_parse_phandle(ep->local_node, "remote-endpoint", 0);
 
-        while (1) {
-                struct device_node *ep_node;
-
-                ep_node = of_graph_get_next_endpoint(entity, prev);
-                of_node_put(prev);
-                prev = ep_node;
-
-                if (!ep_node)
-                        break;
-
+        for_each_endpoint_of_node(entity, ep_node) {
                 if (ep_node == entity_ep_node)
                         continue;
 
@@ -603,27 +594,19 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
 static int rcar_du_encoders_init(struct rcar_du_device *rcdu)
 {
         struct device_node *np = rcdu->dev->of_node;
-        struct device_node *prev = NULL;
+        struct device_node *ep_node;
         unsigned int num_encoders = 0;
 
         /*
          * Iterate over the endpoints and create one encoder for each output
          * pipeline.
          */
-        while (1) {
-                struct device_node *ep_node;
+        for_each_endpoint_of_node(np, ep_node) {
                 enum rcar_du_output output;
                 struct of_endpoint ep;
                 unsigned int i;
                 int ret;
 
-                ep_node = of_graph_get_next_endpoint(np, prev);
-                of_node_put(prev);
-                prev = ep_node;
-
-                if (ep_node == NULL)
-                        break;
-
                 ret = of_graph_parse_endpoint(ep_node, &ep);
                 if (ret < 0) {
                         of_node_put(ep_node);
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 30da7813d53e..3962176ee713 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -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;
 }