summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2015-12-16 11:32:19 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 12:19:17 -0200
commit82c682905dbc9785f26711e34cb4d16ba3a798d7 (patch)
treebe9756902b9ae386c4c550d903b909b315c1b7ff
parentc8d54cd53b43c514fbd8d36abf0f2f00f719dd54 (diff)
downloadlwn-82c682905dbc9785f26711e34cb4d16ba3a798d7.tar.gz
lwn-82c682905dbc9785f26711e34cb4d16ba3a798d7.zip
[media] media: Move struct media_entity_graph definition up
It will be needed in struct media_pipeline shortly. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--include/media/media-entity.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index c593dbd3e030..e8ef40c809ad 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -97,6 +97,16 @@ struct media_entity_enum {
int idx_max;
};
+struct media_entity_graph {
+ struct {
+ struct media_entity *entity;
+ struct list_head *link;
+ } stack[MEDIA_ENTITY_ENUM_MAX_DEPTH];
+
+ DECLARE_BITMAP(entities, MEDIA_ENTITY_ENUM_MAX_ID);
+ int top;
+};
+
struct media_pipeline {
};
@@ -464,16 +474,6 @@ static inline bool media_entity_enum_intersects(
min(ent_enum1->idx_max, ent_enum2->idx_max));
}
-struct media_entity_graph {
- struct {
- struct media_entity *entity;
- struct list_head *link;
- } stack[MEDIA_ENTITY_ENUM_MAX_DEPTH];
-
- DECLARE_BITMAP(entities, MEDIA_ENTITY_ENUM_MAX_ID);
- int top;
-};
-
#define gobj_to_entity(gobj) \
container_of(gobj, struct media_entity, graph_obj)