Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa762394 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 20fe0319

drivers/media/media-device.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/media/media-entity.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

		}

drivers/media/platform/vsp1/vsp1_video.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

include/media/media-entity.h

+5 −0
Original line number Diff line number Diff line
@@ -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