[media] media: create a macro to get entity ID

Instead of accessing directly entity.id, let's create a macro,
as this field will be moved into a common struct later on.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index c55ab5029323acf0b059ceeb2cfcf7e682a6f724..e429605ca2c37b4e8f055ac1d5ee253a4f8d4119 100644 (file)
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -77,8 +77,8 @@ static struct media_entity *find_entity(struct media_device *mdev, u32 id)
        spin_lock(&mdev->lock);
 
        media_device_for_each_entity(entity, mdev) {
-               if ((entity->id == id && !next) ||
-                   (entity->id > id && next)) {
+               if (((media_entity_id(entity) == id) && !next) ||
+                   ((media_entity_id(entity) > id) && next)) {
                        spin_unlock(&mdev->lock);
                        return entity;
                }
@@ -104,7 +104,7 @@ static long media_device_enum_entities(struct media_device *mdev,
        if (ent == NULL)
                return -EINVAL;
 
-       u_ent.id = ent->id;
+       u_ent.id = media_entity_id(ent);
        if (ent->name)
                strlcpy(u_ent.name, ent->name, sizeof(u_ent.name));
        u_ent.type = ent->type;
@@ -122,7 +122,7 @@ static long media_device_enum_entities(struct media_device *mdev,
 static void media_device_kpad_to_upad(const struct media_pad *kpad,
                                      struct media_pad_desc *upad)
 {
-       upad->entity = kpad->entity->id;
+       upad->entity = media_entity_id(kpad->entity);
        upad->index = kpad->index;
        upad->flags = kpad->flags;
 }

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index eabcbacfe387c577af8b6677345613b4e95ce8dc..0342be39cae2208dce3037172513bc903aa3553d 100644 (file)
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -140,10 +140,10 @@ void media_entity_graph_walk_start(struct media_entity_graph *graph,
        graph->stack[graph->top].entity = NULL;
        bitmap_zero(graph->entities, MEDIA_ENTITY_ENUM_MAX_ID);
 
-       if (WARN_ON(entity->id >= MEDIA_ENTITY_ENUM_MAX_ID))
+       if (WARN_ON(media_entity_id(entity) >= MEDIA_ENTITY_ENUM_MAX_ID))
                return;
 
-       __set_bit(entity->id, graph->entities);
+       __set_bit(media_entity_id(entity), graph->entities);
        stack_push(graph, entity);
 }
 EXPORT_SYMBOL_GPL(media_entity_graph_walk_start);
@@ -184,11 +184,11 @@ media_entity_graph_walk_next(struct media_entity_graph *graph)
 
                /* Get the entity in the other end of the link . */
                next = media_entity_other(entity, link);
-               if (WARN_ON(next->id >= MEDIA_ENTITY_ENUM_MAX_ID))
+               if (WARN_ON(media_entity_id(next) >= MEDIA_ENTITY_ENUM_MAX_ID))
                        return NULL;
 
                /* Has the entity already been visited? */
-               if (__test_and_set_bit(next->id, graph->entities)) {
+               if (__test_and_set_bit(media_entity_id(next), graph->entities)) {
                        link_top(graph)++;
                        continue;
                }

diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index fb52683b5c2228e7ed4c1ba6c6a7c3fcbc5ba5ec..516595cff4083fb14dbe13d936e0e5304ae4a5d7 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -323,10 +323,10 @@ static int vsp1_pipeline_validate_branch(struct vsp1_pipeline *pipe,
                        break;
 
                /* Ensure the branch has no loop. */
-               if (entities & (1 << entity->subdev.entity.id))
+               if (entities & (1 << media_entity_id(&entity->subdev.entity)))
                        return -EPIPE;
 
-               entities |= 1 << entity->subdev.entity.id;
+               entities |= 1 << media_entity_id(&entity->subdev.entity);
 
                /* UDS can't be chained. */
                if (entity->type == VSP1_ENTITY_UDS) {

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index b92366317aee03d232f85aab5a975709f1396ee6..57881758927e0f69cff03292aa1e34b48978cee7 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -113,6 +113,11 @@ static inline u32 media_entity_subtype(struct media_entity *entity)
        return entity->type & MEDIA_ENT_SUBTYPE_MASK;
 }
 
+static inline u32 media_entity_id(struct media_entity *entity)
+{
+       return entity->id;
+}
+
 #define MEDIA_ENTITY_ENUM_MAX_DEPTH    16
 #define MEDIA_ENTITY_ENUM_MAX_ID       64