summaryrefslogtreecommitdiff
path: root/include/media/media-device.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-16 19:28:01 +0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 17:19:23 +0300
commit05b3b77cbbb01180b681bc9211f3d471123809ca (patch)
tree265735ae8ce898ec872e093afdc6847c70433c7f /include/media/media-device.h
parent03e493388415df701d4b9e362021a83529018a3b (diff)
downloadlinux-05b3b77cbbb01180b681bc9211f3d471123809ca.tar.xz
[media] media-device.h: use just one u32 counter for object ID
Instead of using one u32 counter per type for object IDs, use just one counter. With such change, it makes sense to simplify the debug logs too. 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.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/media/media-device.h b/include/media/media-device.h
index 0dc67f2c2d0a..d3855898c3fc 100644
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -275,10 +275,7 @@ struct device;
* @driver_version: Device driver version
* @topology_version: Monotonic counter for storing the version of the graph
* topology. Should be incremented each time the topology changes.
- * @entity_id: Unique ID used on the last entity registered
- * @pad_id: Unique ID used on the last pad registered
- * @link_id: Unique ID used on the last link registered
- * @intf_devnode_id: Unique ID used on the last interface devnode registered
+ * @id: Unique ID used on the last registered graph object
* @entity_internal_idx: Unique internal entity ID used by the graph traversal
* algorithms
* @entity_internal_idx_max: Allocated internal entity indices
@@ -313,10 +310,7 @@ struct media_device {
u32 topology_version;
- u32 entity_id;
- u32 pad_id;
- u32 link_id;
- u32 intf_devnode_id;
+ u32 id;
struct ida entity_internal_idx;
int entity_internal_idx_max;