Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-08 20:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] media: entity: Split graph walk iteration into two functions

Browse Source 
With media_entity_graph_walk_next() getting more and more complicated (and
especially so with has_routing() support added), split the function into
two.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sakari Ailus 2016-07-20 12:31:39 -03:00 committed by Mauro Carvalho Chehab
parent 20b8522736
commit 5b1f832912
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/media/media-entity.c
View File

@ -324,6 +324,34 @@ void media_graph_walk_start(struct media_graph *graph,
} }
EXPORT_SYMBOL_GPL(media_graph_walk_start); EXPORT_SYMBOL_GPL(media_graph_walk_start);
static void media_graph_walk_iter(struct media_graph *graph)
{
struct media_entity *entity = stack_top(graph);
struct media_link *link;
struct media_entity *next;
link = list_entry(link_top(graph), typeof(*link), list);
/* The link is not enabled so we do not follow. */
if (!(link->flags & MEDIA_LNK_FL_ENABLED)) {
link_top(graph) = link_top(graph)->next;
return;
}
/* Get the entity in the other end of the link . */
next = media_entity_other(entity, link);
/* Has the entity already been visited? */
if (media_entity_enum_test_and_set(&graph->ent_enum, next)) {
link_top(graph) = link_top(graph)->next;
return;
}
/* Push the new entity to stack and start over. */
link_top(graph) = link_top(graph)->next;
stack_push(graph, next);
}
struct media_entity *media_graph_walk_next(struct media_graph *graph) struct media_entity *media_graph_walk_next(struct media_graph *graph)
{ {
if (stack_top(graph) == NULL) if (stack_top(graph) == NULL)
@ -334,32 +362,8 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph)
* top of the stack until no more entities on the level can be * top of the stack until no more entities on the level can be
* found. * found.
*/ */
while (link_top(graph) != &stack_top(graph)->links) { while (link_top(graph) != &stack_top(graph)->links)
struct media_entity *entity = stack_top(graph); media_graph_walk_iter(graph);
struct media_link *link;
struct media_entity *next;
link = list_entry(link_top(graph), typeof(*link), list);
/* The link is not enabled so we do not follow. */
if (!(link->flags & MEDIA_LNK_FL_ENABLED)) {
link_top(graph) = link_top(graph)->next;
continue;
}
/* Get the entity in the other end of the link . */
next = media_entity_other(entity, link);
/* Has the entity already been visited? */
if (media_entity_enum_test_and_set(&graph->ent_enum, next)) {
link_top(graph) = link_top(graph)->next;
continue;
}
/* Push the new entity to stack and start over. */
link_top(graph) = link_top(graph)->next;
stack_push(graph, next);
}
return stack_pop(graph); return stack_pop(graph);
} }