diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2014-12-01 07:32:32 -0500 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2015-02-23 05:42:23 -0500 |
commit | f033c0bcc53675562200680f4cb4a86710d9fbae (patch) | |
tree | 0fceddf110155d73a39194e945b1c9b473a7e37f /drivers/gpu/drm/rcar-du | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) |
of: Decrement refcount of previous endpoint in of_graph_get_next_endpoint
Decrementing the reference count of the previous endpoint node allows to
use the of_graph_get_next_endpoint function in a for_each_... style macro.
All current users of this function that pass a non-NULL prev parameter
(that is, soc_camera and imx-drm) are changed to not decrement the passed
prev argument's refcount themselves.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/rcar-du')
-rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_kms.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index cc9136e8ee9c..68dab2601bf5 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c | |||
@@ -206,7 +206,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, | |||
206 | enum rcar_du_encoder_type enc_type = RCAR_DU_ENCODER_NONE; | 206 | enum rcar_du_encoder_type enc_type = RCAR_DU_ENCODER_NONE; |
207 | struct device_node *connector = NULL; | 207 | struct device_node *connector = NULL; |
208 | struct device_node *encoder = NULL; | 208 | struct device_node *encoder = NULL; |
209 | struct device_node *prev = NULL; | 209 | struct device_node *ep_node = NULL; |
210 | struct device_node *entity_ep_node; | 210 | struct device_node *entity_ep_node; |
211 | struct device_node *entity; | 211 | struct device_node *entity; |
212 | int ret; | 212 | int ret; |
@@ -225,11 +225,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, | |||
225 | entity_ep_node = of_parse_phandle(ep->local_node, "remote-endpoint", 0); | 225 | entity_ep_node = of_parse_phandle(ep->local_node, "remote-endpoint", 0); |
226 | 226 | ||
227 | while (1) { | 227 | while (1) { |
228 | struct device_node *ep_node; | 228 | ep_node = of_graph_get_next_endpoint(entity, ep_node); |
229 | |||
230 | ep_node = of_graph_get_next_endpoint(entity, prev); | ||
231 | of_node_put(prev); | ||
232 | prev = ep_node; | ||
233 | 229 | ||
234 | if (!ep_node) | 230 | if (!ep_node) |
235 | break; | 231 | break; |
@@ -300,7 +296,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, | |||
300 | static int rcar_du_encoders_init(struct rcar_du_device *rcdu) | 296 | static int rcar_du_encoders_init(struct rcar_du_device *rcdu) |
301 | { | 297 | { |
302 | struct device_node *np = rcdu->dev->of_node; | 298 | struct device_node *np = rcdu->dev->of_node; |
303 | struct device_node *prev = NULL; | 299 | struct device_node *ep_node = NULL; |
304 | unsigned int num_encoders = 0; | 300 | unsigned int num_encoders = 0; |
305 | 301 | ||
306 | /* | 302 | /* |
@@ -308,15 +304,12 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) | |||
308 | * pipeline. | 304 | * pipeline. |
309 | */ | 305 | */ |
310 | while (1) { | 306 | while (1) { |
311 | struct device_node *ep_node; | ||
312 | enum rcar_du_output output; | 307 | enum rcar_du_output output; |
313 | struct of_endpoint ep; | 308 | struct of_endpoint ep; |
314 | unsigned int i; | 309 | unsigned int i; |
315 | int ret; | 310 | int ret; |
316 | 311 | ||
317 | ep_node = of_graph_get_next_endpoint(np, prev); | 312 | ep_node = of_graph_get_next_endpoint(np, ep_node); |
318 | of_node_put(prev); | ||
319 | prev = ep_node; | ||
320 | 313 | ||
321 | if (ep_node == NULL) | 314 | if (ep_node == NULL) |
322 | break; | 315 | break; |