[media] media: Rename is_media_entity_v4l2_io to is_media_entity_v4l2_video_device

All users of is_media_entity_v4l2_io() (the exynos4-is, omap3isp,
davince_vpfe and omap4iss drivers and the v4l2-mc power management code)
use the function to check whether entities are video_device instances,
either to ensure they can cast the entity to a struct video_device, or
to count the number of video nodes users.

The purpose of the function is thus to identify whether the media entity
instance is an instance of the video_device object, not to check whether
it can perform I/O. Rename it accordingly, we will introduce a more
specific is_media_entity_v4l2_io() check when needed.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index 48f62dc4453e542b358c1282acd566d1f58f9cd4..04348b5022323db553cf2cc71811894a27163642 100644 (file)
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -1132,7 +1132,7 @@ static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
        media_entity_graph_walk_start(graph, entity);
 
        while ((entity = media_entity_graph_walk_next(graph))) {
-               if (!is_media_entity_v4l2_io(entity))
+               if (!is_media_entity_v4l2_video_device(entity))
                        continue;
 
                ret  = __fimc_md_modify_pipeline(entity, enable);
@@ -1147,7 +1147,7 @@ err:
        media_entity_graph_walk_start(graph, entity_err);
 
        while ((entity_err = media_entity_graph_walk_next(graph))) {
-               if (!is_media_entity_v4l2_io(entity_err))
+               if (!is_media_entity_v4l2_video_device(entity_err))
                        continue;
 
                __fimc_md_modify_pipeline(entity_err, !enable);

diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index ac76d29015017a811fa4b528d9d4ef5e504c0be4..1b1a95d546f650f9b1bc127c57475b15ab5a7cf9 100644 (file)
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -251,7 +251,7 @@ static int isp_video_get_graph_data(struct isp_video *video,
                if (entity == &video->video.entity)
                        continue;
 
-               if (!is_media_entity_v4l2_io(entity))
+               if (!is_media_entity_v4l2_video_device(entity))
                        continue;
 
                __video = to_isp_video(media_entity_to_video_device(entity));

diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index 2228cd3a846e9536295c77faeff5d15bc22d66a3..ca94bded33864377f585099b2024f0c7477c8424 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -263,7 +263,7 @@ static int pipeline_pm_use_count(struct media_entity *entity,
        media_entity_graph_walk_start(graph, entity);
 
        while ((entity = media_entity_graph_walk_next(graph))) {
-               if (is_media_entity_v4l2_io(entity))
+               if (is_media_entity_v4l2_video_device(entity))
                        use += entity->use_count;
        }
 

diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index b793c04028a3034ac5b732c25af258dbded1f5f3..df4f298617c0b844a317c0df1228c2046515deeb 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -154,7 +154,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video)
        while ((entity = media_entity_graph_walk_next(&graph))) {
                if (entity == &video->video_dev.entity)
                        continue;
-               if (!is_media_entity_v4l2_io(entity))
+               if (!is_media_entity_v4l2_video_device(entity))
                        continue;
                far_end = to_vpfe_video(media_entity_to_video_device(entity));
                if (far_end->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)

diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index f54349bce4de188ba0410ed2d4f68f64c72dbc40..cf8da23558bb54d4195ff7ee8f396bd707733cf1 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -223,7 +223,7 @@ iss_video_far_end(struct iss_video *video)
                if (entity == &video->video.entity)
                        continue;
 
-               if (!is_media_entity_v4l2_io(entity))
+               if (!is_media_entity_v4l2_video_device(entity))
                        continue;
 
                far_end = to_iss_video(media_entity_to_video_device(entity));

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 1986340a8cf26e6461acbdd61a3392802d32c786..e0295eefd7021239d79f1e699eba658f1cb4e35a 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -358,14 +358,14 @@ static inline u32 media_gobj_gen_id(enum media_gobj_type type, u64 local_id)
 }
 
 /**
- * is_media_entity_v4l2_io() - Check if the entity is a video_device
+ * is_media_entity_v4l2_video_device() - Check if the entity is a video_device
  * @entity:    pointer to entity
  *
  * Return: true if the entity is an instance of a video_device object and can
  * safely be cast to a struct video_device using the container_of() macro, or
  * false otherwise.
  */
-static inline bool is_media_entity_v4l2_io(struct media_entity *entity)
+static inline bool is_media_entity_v4l2_video_device(struct media_entity *entity)
 {
        return entity && entity->obj_type == MEDIA_ENTITY_TYPE_VIDEO_DEVICE;
 }