summaryrefslogtreecommitdiffstats
path: root/include/media/media-device.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-08-14 17:47:48 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 15:18:41 +0100
commitbfab2aacccfc144e2cceccb71ec89f1eff1b8c51 (patch)
tree815cf4b3e15e59b00710a75348184debc3619d08 /include/media/media-device.h
parent[media] media: add a common struct to be embed on media graph objects (diff)
downloadlinux-bfab2aacccfc144e2cceccb71ec89f1eff1b8c51.tar.xz
linux-bfab2aacccfc144e2cceccb71ec89f1eff1b8c51.zip
[media] media: use media_gobj inside entities
As entities are graph objects, let's embed media_gobj on it. That ensures an unique ID for entities that can be global along the entire media controller. For now, we'll keep the already existing entity ID. Such field need to be dropped at some point, but for now, let's not do this, to avoid needing to review all drivers and the userspace apps. Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Tested-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media/media-device.h')
-rw-r--r--include/media/media-device.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/media-device.h b/include/media/media-device.h
index a44f18fdf321..f6deef6e5820 100644
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -41,7 +41,7 @@ struct device;
* @bus_info: Unique and stable device location identifier
* @hw_revision: Hardware device revision
* @driver_version: Device driver version
- * @entity_id: ID of the next entity to be registered
+ * @entity_id: Unique ID used on the last entity registered
* @entities: List of registered entities
* @lock: Entities list lock
* @graph_mutex: Entities graph operation lock
@@ -69,6 +69,7 @@ struct media_device {
u32 driver_version;
u32 entity_id;
+
struct list_head entities;
/* Protects the entities list */