[media] media-entity.h: get rid of revision and group_id fields

Both revision and group_id fields were never used and were always
initialized to zero. Remove them.

Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
index 27f8817e7abe96c39e1cbc4f8fff74cd82561b0f..9f7614a012342f58fd2126f5b57ffdd2df67f1c5 100644 (file)
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -59,15 +59,6 @@
     <para>Entity IDs can be non-contiguous. Applications must
     <emphasis>not</emphasis> try to enumerate entities by calling
     MEDIA_IOC_ENUM_ENTITIES with increasing id's until they get an error.</para>
-    <para>Two or more entities that share a common non-zero
-    <structfield>group_id</structfield> value are considered as logically
-    grouped. Groups are used to report
-    <itemizedlist>
-      <listitem><para>ALSA, VBI and video nodes that carry the same media
-      stream</para></listitem>
-      <listitem><para>lens and flash controllers associated with a sensor</para></listitem>
-    </itemizedlist>
-    </para>
 
     <table pgwide="1" frame="none" id="media-entity-desc">
       <title>struct <structname>media_entity_desc</structname></title>
@@ -106,7 +97,7 @@
            <entry><structfield>revision</structfield></entry>
            <entry></entry>
            <entry></entry>
-           <entry>Entity revision in a driver/hardware specific format.</entry>
+           <entry>Entity revision. Always zero (obsolete)</entry>
          </row>
          <row>
            <entry>__u32</entry>
@@ -120,7 +111,7 @@
            <entry><structfield>group_id</structfield></entry>
            <entry></entry>
            <entry></entry>
-           <entry>Entity group ID</entry>
+           <entry>Entity group ID. Always zero (obsolete)</entry>
          </row>
          <row>
            <entry>__u16</entry>

diff --git a/Documentation/media-framework.txt b/Documentation/media-framework.txt
index 7fbfe4bd1f4765d7753d4152fe63d36ba2875614..ef3663af1db3792786a63f5c2c484016aedc04aa 100644 (file)
--- a/Documentation/media-framework.txt
+++ b/Documentation/media-framework.txt
@@ -110,10 +110,10 @@ If no pads are needed, drivers could directly fill entity->num_pads
 with 0 and entity->pads with NULL or to call the above function that
 will do the same.
 
-The media_entity name, type, flags, revision and group_id fields should be
-initialized before calling media_device_register_entity(). Entities embedded
-in higher-level standard structures can have some of those fields set by the
-higher-level framework.
+The media_entity name, type and flags fields should be initialized before
+calling media_device_register_entity(). Entities embedded in higher-level
+standard structures can have some of those fields set by the higher-level
+framework.
 
 As the number of pads is known in advance, the pads array is not allocated
 dynamically but is managed by the entity driver. Most drivers will embed the
@@ -164,9 +164,7 @@ Entities have flags that describe the entity capabilities and state.
 
 Logical entity groups can be defined by setting the group ID of all member
 entities to the same non-zero value. An entity group serves no purpose in the
-kernel, but is reported to userspace during entities enumeration. The group_id
-field belongs to the media device driver and must not by touched by entity
-drivers.
+kernel, but is reported to userspace during entities enumeration.
 
 Media device drivers should define groups if several entities are logically
 bound together. Example usages include reporting

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index b8cd7733a31c60b5c3636743f8eb06aa88c658c1..537160bb461e07620c13fa9ce1bf4de4247470d6 100644 (file)
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -109,9 +109,9 @@ static long media_device_enum_entities(struct media_device *mdev,
        if (ent->name)
                strlcpy(u_ent.name, ent->name, sizeof(u_ent.name));
        u_ent.type = ent->function;
-       u_ent.revision = ent->revision;
+       u_ent.revision = 0;             /* Unused */
        u_ent.flags = ent->flags;
-       u_ent.group_id = ent->group_id;
+       u_ent.group_id = 0;             /* Unused */
        u_ent.pads = ent->num_pads;
        u_ent.links = ent->num_links - ent->num_backlinks;
        memcpy(&u_ent.raw, &ent->info, sizeof(ent->info));

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 32fef503d95066b71771052c1d29c841a5164347..031536723d8ca90f65d24336a4770464ffd7ba2e 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -153,9 +153,7 @@ struct media_entity_operations {
  * @name:      Entity name.
  * @function:  Entity main function, as defined in uapi/media.h
  *             (MEDIA_ENT_F_*)
- * @revision:  Entity revision - OBSOLETE - should be removed soon.
  * @flags:     Entity flags, as defined in uapi/media.h (MEDIA_ENT_FL_*)
- * @group_id:  Entity group ID - OBSOLETE - should be removed soon.
  * @num_pads:  Number of sink and source pads.
  * @num_links: Total number of links, forward and back, enabled and disabled.
  * @num_backlinks: Number of backlinks
@@ -180,9 +178,7 @@ struct media_entity {
        struct media_gobj graph_obj;    /* must be first field in struct */
        const char *name;
        u32 function;
-       u32 revision;
        unsigned long flags;
-       u32 group_id;
 
        u16 num_pads;
        u16 num_links;