diff options
author | Dave Airlie <airlied@redhat.com> | 2015-04-13 03:28:16 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-04-13 03:28:16 -0400 |
commit | bb1dc08c94ead1b98e750caf535422f79363c1a2 (patch) | |
tree | 8e1db4d7b2de470223c7a98aca3e2f47d6d5ed83 /drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | |
parent | a7d6883619584c2dbeeb5f6a1cf86cde6a3993de (diff) | |
parent | ecaa4902222fd4d28692203bec028513fbac29c7 (diff) |
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
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/omapdss-boot-init.c')
-rw-r--r-- | drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c index 42b87f95267c..8b6f6d5fdd68 100644 --- a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c +++ b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | |||
@@ -164,20 +164,15 @@ static void __init omapdss_walk_device(struct device_node *node, bool root) | |||
164 | 164 | ||
165 | pn = of_graph_get_remote_port_parent(n); | 165 | pn = of_graph_get_remote_port_parent(n); |
166 | 166 | ||
167 | if (!pn) { | 167 | if (!pn) |
168 | of_node_put(n); | ||
169 | continue; | 168 | continue; |
170 | } | ||
171 | 169 | ||
172 | if (!of_device_is_available(pn) || omapdss_list_contains(pn)) { | 170 | if (!of_device_is_available(pn) || omapdss_list_contains(pn)) { |
173 | of_node_put(pn); | 171 | of_node_put(pn); |
174 | of_node_put(n); | ||
175 | continue; | 172 | continue; |
176 | } | 173 | } |
177 | 174 | ||
178 | omapdss_walk_device(pn, false); | 175 | omapdss_walk_device(pn, false); |
179 | |||
180 | of_node_put(n); | ||
181 | } | 176 | } |
182 | } | 177 | } |
183 | 178 | ||