Merge tag 'sound-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-block.git] / include / media / media-device.h

diff --git a/include/media/media-device.h b/include/media/media-device.h
index 706afdb22d0d56740320e2a1cccf99464e81d9b7..d3855898c3fc6767fe7f7fb30895173845e8548f 100644 (file)
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -275,11 +275,10 @@ 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
- * @entity_internal_idx: Allocated internal entity indices
+ * @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
  * @entities:  List of registered entities
  * @interfaces:        List of registered interfaces
  * @pads:      List of registered pads
@@ -311,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;
 
@@ -344,7 +340,7 @@ struct media_device {
 /**
  * media_entity_enum_init - Initialise an entity enumeration
  *
- * @e: Entity enumeration to be initialised
+ * @ent_enum: Entity enumeration to be initialised
  * @mdev: The related media device
  *
  * Returns zero on success or a negative error code.