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

Commit d10c9894 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab
Browse files

[media] media: use entity.graph_obj.mdev instead of .parent 



The struct media_entity has a .parent field that stores a pointer
to the parent struct media_device. But recently a media_gobj was
embedded into the entities and since struct media_gojb already has
a pointer to a struct media_device in the .mdev field, the .parent
field becomes redundant and can be removed.

This patch replaces all the usage of .parent by .graph_obj.mdev so
that field will become unused and can be removed on a later patch.

No functional changes.

The transformation was made using the following coccinelle spatch:

@@
struct media_entity *me;
@@

- me->parent
+ me->graph_obj.mdev

@@
struct media_entity *link;
@@

- link->source->entity->parent
+ link->source->entity->graph_obj.mdev

@@
struct exynos_video_entity *ve;
@@

- ve->vdev.entity.parent
+ ve->vdev.entity.graph_obj.mdev

Suggested-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8df00a15

drivers/media/media-device.c

+4 −4
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ int __must_check media_device_register_entity(struct media_device *mdev, 
	int i;



	/* Warn if we apparently re-register an entity */

	WARN_ON(entity->parent != NULL);

	entity->parent = mdev;

	WARN_ON(entity->graph_obj.mdev != NULL);

	entity->graph_obj.mdev = mdev;



	spin_lock(&mdev->lock);

	/* Initialize media_gobj embedded at the entity */
@@ -471,7 +471,7 @@ EXPORT_SYMBOL_GPL(media_device_register_entity); 
void media_device_unregister_entity(struct media_entity *entity)

{

	int i;

	struct media_device *mdev = entity->parent;

	struct media_device *mdev = entity->graph_obj.mdev;



	if (mdev == NULL)

		return;
@@ -484,7 +484,7 @@ void media_device_unregister_entity(struct media_entity *entity) 
	media_gobj_remove(&entity->graph_obj);

	list_del(&entity->list);

	spin_unlock(&mdev->lock);

	entity->parent = NULL;

	entity->graph_obj.mdev = NULL;

}

EXPORT_SYMBOL_GPL(media_device_unregister_entity);

drivers/media/media-entity.c

+18 −16
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ EXPORT_SYMBOL_GPL(media_entity_graph_walk_next); 
__must_check int media_entity_pipeline_start(struct media_entity *entity,

					     struct media_pipeline *pipe)

{

	struct media_device *mdev = entity->parent;

	struct media_device *mdev = entity->graph_obj.mdev;

	struct media_entity_graph graph;

	struct media_entity *entity_err = entity;

	int ret;
@@ -387,7 +387,7 @@ __must_check int media_entity_pipeline_start(struct media_entity *entity, 


			ret = entity->ops->link_validate(link);

			if (ret < 0 && ret != -ENOIOCTLCMD) {

				dev_dbg(entity->parent->dev,

				dev_dbg(entity->graph_obj.mdev->dev,

					"link validation failed for \"%s\":%u -> \"%s\":%u, error %d\n",

					link->source->entity->name,

					link->source->index,
@@ -401,7 +401,7 @@ __must_check int media_entity_pipeline_start(struct media_entity *entity, 


		if (!bitmap_full(active, entity->num_pads)) {

			ret = -EPIPE;

			dev_dbg(entity->parent->dev,

			dev_dbg(entity->graph_obj.mdev->dev,

				"\"%s\":%u must be connected by an enabled link\n",

				entity->name,

				(unsigned)find_first_zero_bit(
@@ -454,7 +454,7 @@ EXPORT_SYMBOL_GPL(media_entity_pipeline_start); 
 */

void media_entity_pipeline_stop(struct media_entity *entity)

{

	struct media_device *mdev = entity->parent;

	struct media_device *mdev = entity->graph_obj.mdev;

	struct media_entity_graph graph;



	mutex_lock(&mdev->graph_mutex);
@@ -490,8 +490,8 @@ struct media_entity *media_entity_get(struct media_entity *entity) 
	if (entity == NULL)

		return NULL;



	if (entity->parent->dev &&

	    !try_module_get(entity->parent->dev->driver->owner))

	if (entity->graph_obj.mdev->dev &&

	    !try_module_get(entity->graph_obj.mdev->dev->driver->owner))

		return NULL;



	return entity;
@@ -511,8 +511,8 @@ void media_entity_put(struct media_entity *entity) 
	if (entity == NULL)

		return;



	if (entity->parent->dev)

		module_put(entity->parent->dev->driver->owner);

	if (entity->graph_obj.mdev->dev)

		module_put(entity->graph_obj.mdev->dev->driver->owner);

}

EXPORT_SYMBOL_GPL(media_entity_put);
@@ -561,7 +561,8 @@ media_create_pad_link(struct media_entity *source, u16 source_pad, 
	link->flags = flags;



	/* Initialize graph object embedded at the new link */

	media_gobj_init(source->parent, MEDIA_GRAPH_LINK, &link->graph_obj);

	media_gobj_init(source->graph_obj.mdev, MEDIA_GRAPH_LINK,

			&link->graph_obj);



	/* Create the backlink. Backlinks are used to help graph traversal and

	 * are not reported to userspace.
@@ -577,7 +578,8 @@ media_create_pad_link(struct media_entity *source, u16 source_pad, 
	backlink->flags = flags;



	/* Initialize graph object embedded at the new link */

	media_gobj_init(sink->parent, MEDIA_GRAPH_LINK, &backlink->graph_obj);

	media_gobj_init(sink->graph_obj.mdev, MEDIA_GRAPH_LINK,

			&backlink->graph_obj);



	link->reverse = backlink;

	backlink->reverse = link;
@@ -629,12 +631,12 @@ EXPORT_SYMBOL_GPL(__media_entity_remove_links); 
void media_entity_remove_links(struct media_entity *entity)

{

	/* Do nothing if the entity is not registered. */

	if (entity->parent == NULL)

	if (entity->graph_obj.mdev == NULL)

		return;



	mutex_lock(&entity->parent->graph_mutex);

	mutex_lock(&entity->graph_obj.mdev->graph_mutex);

	__media_entity_remove_links(entity);

	mutex_unlock(&entity->parent->graph_mutex);

	mutex_unlock(&entity->graph_obj.mdev->graph_mutex);

}

EXPORT_SYMBOL_GPL(media_entity_remove_links);
@@ -703,7 +705,7 @@ int __media_entity_setup_link(struct media_link *link, u32 flags) 
	    (source->stream_count || sink->stream_count))

		return -EBUSY;



	mdev = source->parent;

	mdev = source->graph_obj.mdev;



	if (mdev->link_notify) {

		ret = mdev->link_notify(link, flags,
@@ -724,9 +726,9 @@ int media_entity_setup_link(struct media_link *link, u32 flags) 
{

	int ret;



	mutex_lock(&link->source->entity->parent->graph_mutex);

	mutex_lock(&link->source->entity->graph_obj.mdev->graph_mutex);

	ret = __media_entity_setup_link(link, flags);

	mutex_unlock(&link->source->entity->parent->graph_mutex);

	mutex_unlock(&link->source->entity->graph_obj.mdev->graph_mutex);



	return ret;

}

drivers/media/platform/exynos4-is/fimc-isp-video.c

+3 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int isp_video_open(struct file *file) 
		goto rel_fh;



	if (v4l2_fh_is_singular_file(file)) {

		mutex_lock(&me->parent->graph_mutex);

		mutex_lock(&me->graph_obj.mdev->graph_mutex);



		ret = fimc_pipeline_call(ve, open, me, true);
@@ -295,7 +295,7 @@ static int isp_video_open(struct file *file) 
		if (ret == 0)

			me->use_count++;



		mutex_unlock(&me->parent->graph_mutex);

		mutex_unlock(&me->graph_obj.mdev->graph_mutex);

	}

	if (!ret)

		goto unlock;
@@ -311,7 +311,7 @@ static int isp_video_release(struct file *file) 
	struct fimc_isp *isp = video_drvdata(file);

	struct fimc_is_video *ivc = &isp->video_capture;

	struct media_entity *entity = &ivc->ve.vdev.entity;

	struct media_device *mdev = entity->parent;

	struct media_device *mdev = entity->graph_obj.mdev;



	mutex_lock(&isp->video_lock);

drivers/media/platform/exynos4-is/fimc-lite.c

+4 −4
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int fimc_lite_open(struct file *file) 
	    atomic_read(&fimc->out_path) != FIMC_IO_DMA)

		goto unlock;



	mutex_lock(&me->parent->graph_mutex);

	mutex_lock(&me->graph_obj.mdev->graph_mutex);



	ret = fimc_pipeline_call(&fimc->ve, open, me, true);
@@ -502,7 +502,7 @@ static int fimc_lite_open(struct file *file) 
	if (ret == 0)

		me->use_count++;



	mutex_unlock(&me->parent->graph_mutex);

	mutex_unlock(&me->graph_obj.mdev->graph_mutex);



	if (!ret) {

		fimc_lite_clear_event_counters(fimc);
@@ -535,9 +535,9 @@ static int fimc_lite_release(struct file *file) 
		fimc_pipeline_call(&fimc->ve, close);

		clear_bit(ST_FLITE_IN_USE, &fimc->state);



		mutex_lock(&entity->parent->graph_mutex);

		mutex_lock(&entity->graph_obj.mdev->graph_mutex);

		entity->use_count--;

		mutex_unlock(&entity->parent->graph_mutex);

		mutex_unlock(&entity->graph_obj.mdev->graph_mutex);

	}



	_vb2_fop_release(file, NULL);

drivers/media/platform/exynos4-is/media-dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ static int __fimc_md_modify_pipeline(struct media_entity *entity, bool enable) 
	return ret;

}



/* Locking: called with entity->parent->graph_mutex mutex held. */

/* Locking: called with entity->graph_obj.mdev->graph_mutex mutex held. */

static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable)

{

	struct media_entity *entity_err = entity;