[media] media: use macros to check for V4L2 subdev entities

Instead of relying on media subtype, use the new macros to detect
if an entity is a subdev or an A/V DMA entity.

Please note that most drivers assume that there's just AV_DMA or
V4L2 subdevs. This is not true anymore, as we've added MC support
for DVB, and there are plans to add support for ALSA and FB/DRM
too.

Ok, on the current pipelines supported by those drivers, just V4L
stuff are there, but, assuming that some day a pipeline that also
works with other subsystems will ever added, it is better to add
explicit checks for the AV_DMA stuff.

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

diff --git a/drivers/media/platform/exynos4-is/common.c b/drivers/media/platform/exynos4-is/common.c
index b6716c57b5db313dd7127637a5532343e9737be8..b90f5bb15517b10692890639c3823e7df512cd2e 100644 (file)
--- a/drivers/media/platform/exynos4-is/common.c
+++ b/drivers/media/platform/exynos4-is/common.c
@@ -22,8 +22,7 @@ struct v4l2_subdev *fimc_find_remote_sensor(struct media_entity *entity)
        while (pad->flags & MEDIA_PAD_FL_SINK) {
                /* source pad */
                pad = media_entity_remote_pad(pad);
-               if (pad == NULL ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                sd = media_entity_to_v4l2_subdev(pad->entity);

diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 8f5bee42783f1b8f037a8666f45217c472368c8e..48a826372d3d563ae3ecb4d9ce5beee42e063b96 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -1136,8 +1136,7 @@ static int fimc_pipeline_validate(struct fimc_dev *fimc)
                        }
                }
 
-               if (src_pad == NULL ||
-                   media_entity_type(src_pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!src_pad || !is_media_entity_v4l2_subdev(src_pad->entity))
                        break;
 
                /* Don't call FIMC subdev operation to avoid nested locking */
@@ -1392,7 +1391,7 @@ static int fimc_link_setup(struct media_entity *entity,
        struct fimc_vid_cap *vc = &fimc->vid_cap;
        struct v4l2_subdev *sensor;
 
-       if (media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+       if (!is_media_entity_v4l2_subdev(remote->entity))
                return -EINVAL;
 
        if (WARN_ON(fimc == NULL))

diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
index 239df7d8bd306747efaa66ef5d34468a58d44168..9c7794bcf0c32019d5b5d30f51dc23de0a187a82 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
@@ -466,8 +466,7 @@ static int isp_video_pipeline_validate(struct fimc_isp *isp)
 
                /* Retrieve format at the source pad */
                pad = media_entity_remote_pad(pad);
-               if (pad == NULL ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                sd = media_entity_to_v4l2_subdev(pad->entity);

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 11d25712153dd2a118fa2f20bac67f0b1ea29670..957cf144a6752876d92e8f41900a8872b2f0e4b2 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -808,8 +808,7 @@ static int fimc_pipeline_validate(struct fimc_lite *fimc)
                }
                /* Retrieve format at the source pad */
                pad = media_entity_remote_pad(pad);
-               if (pad == NULL ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                sd = media_entity_to_v4l2_subdev(pad->entity);
@@ -982,7 +981,6 @@ static int fimc_lite_link_setup(struct media_entity *entity,
 {
        struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
        struct fimc_lite *fimc = v4l2_get_subdevdata(sd);
-       unsigned int remote_ent_type = media_entity_type(remote->entity);
        int ret = 0;
 
        if (WARN_ON(fimc == NULL))
@@ -994,7 +992,7 @@ static int fimc_lite_link_setup(struct media_entity *entity,
 
        switch (local->index) {
        case FLITE_SD_PAD_SINK:
-               if (remote_ent_type != MEDIA_ENT_T_V4L2_SUBDEV) {
+               if (!is_media_entity_v4l2_subdev(remote->entity)) {
                        ret = -EINVAL;
                        break;
                }
@@ -1012,7 +1010,7 @@ static int fimc_lite_link_setup(struct media_entity *entity,
        case FLITE_SD_PAD_SOURCE_DMA:
                if (!(flags & MEDIA_LNK_FL_ENABLED))
                        atomic_set(&fimc->out_path, FIMC_IO_NONE);
-               else if (remote_ent_type == MEDIA_ENT_T_DEVNODE)
+               else if (is_media_entity_v4l2_io(remote->entity))
                        atomic_set(&fimc->out_path, FIMC_IO_DMA);
                else
                        ret = -EINVAL;
@@ -1021,7 +1019,7 @@ static int fimc_lite_link_setup(struct media_entity *entity,
        case FLITE_SD_PAD_SOURCE_ISP:
                if (!(flags & MEDIA_LNK_FL_ENABLED))
                        atomic_set(&fimc->out_path, FIMC_IO_NONE);
-               else if (remote_ent_type == MEDIA_ENT_T_V4L2_SUBDEV)
+               else if (is_media_entity_v4l2_subdev(remote->entity))
                        atomic_set(&fimc->out_path, FIMC_IO_ISP);
                else
                        ret = -EINVAL;

diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index a67b98676dd923c4c7e8d7c57818932d42a91a37..a61ecedc12015cef750d5c9216fbb1e794dbd41d 100644 (file)
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -88,8 +88,7 @@ static void fimc_pipeline_prepare(struct fimc_pipeline *p,
                                break;
                }
 
-               if (pad == NULL ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
                sd = media_entity_to_v4l2_subdev(pad->entity);
 
@@ -1062,7 +1061,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 (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)
+               if (!is_media_entity_v4l2_io(entity))
                        continue;
 
                ret  = __fimc_md_modify_pipeline(entity, enable);
@@ -1076,7 +1075,7 @@ static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable)
        media_entity_graph_walk_start(&graph, entity_err);
 
        while ((entity_err = media_entity_graph_walk_next(&graph))) {
-               if (media_entity_type(entity_err) != MEDIA_ENT_T_DEVNODE)
+               if (!is_media_entity_v4l2_io(entity_err))
                        continue;
 
                __fimc_md_modify_pipeline(entity_err, !enable);

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 69e7733d36cd0feca129108e3c6198d35fea745a..cb8ac90086c1410dc963550a72c711ba9b75513e 100644 (file)
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -691,7 +691,7 @@ static int isp_pipeline_pm_use_count(struct media_entity *entity)
        media_entity_graph_walk_start(&graph, entity);
 
        while ((entity = media_entity_graph_walk_next(&graph))) {
-               if (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE)
+               if (is_media_entity_v4l2_io(entity))
                        use += entity->use_count;
        }
 
@@ -714,7 +714,7 @@ static int isp_pipeline_pm_power_one(struct media_entity *entity, int change)
        struct v4l2_subdev *subdev;
        int ret;
 
-       subdev = media_entity_type(entity) == MEDIA_ENT_T_V4L2_SUBDEV
+       subdev = is_media_entity_v4l2_subdev(entity)
               ? media_entity_to_v4l2_subdev(entity) : NULL;
 
        if (entity->use_count == 0 && change > 0 && subdev != NULL) {
@@ -754,7 +754,7 @@ static int isp_pipeline_pm_power(struct media_entity *entity, int change)
        media_entity_graph_walk_start(&graph, entity);
 
        while (!ret && (entity = media_entity_graph_walk_next(&graph)))
-               if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)
+               if (is_media_entity_v4l2_subdev(entity))
                        ret = isp_pipeline_pm_power_one(entity, change);
 
        if (!ret)
@@ -764,7 +764,7 @@ static int isp_pipeline_pm_power(struct media_entity *entity, int change)
 
        while ((first = media_entity_graph_walk_next(&graph))
               && first != entity)
-               if (media_entity_type(first) != MEDIA_ENT_T_DEVNODE)
+               if (is_media_entity_v4l2_subdev(first))
                        isp_pipeline_pm_power_one(first, -change);
 
        return ret;
@@ -897,8 +897,7 @@ static int isp_pipeline_enable(struct isp_pipeline *pipe,
                        break;
 
                pad = media_entity_remote_pad(pad);
-               if (pad == NULL ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                entity = pad->entity;
@@ -988,8 +987,7 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe)
                        break;
 
                pad = media_entity_remote_pad(pad);
-               if (pad == NULL ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                entity = pad->entity;

diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index a2e53b34d95fb7524759f5628348103592dc7ac4..768efd775abca19a886eee998246700026767779 100644 (file)
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -210,8 +210,7 @@ isp_video_remote_subdev(struct isp_video *video, u32 *pad)
 
        remote = media_entity_remote_pad(&video->pad);
 
-       if (remote == NULL ||
-           media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+       if (!remote || !is_media_entity_v4l2_subdev(remote->entity))
                return NULL;
 
        if (pad)
@@ -243,7 +242,7 @@ static int isp_video_get_graph_data(struct isp_video *video,
                if (entity == &video->video.entity)
                        continue;
 
-               if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)
+               if (!is_media_entity_v4l2_io(entity))
                        continue;
 
                __video = to_isp_video(media_entity_to_video_device(entity));
@@ -919,7 +918,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
                return -EINVAL;
        }
 
-       if (media_entity_type(source) != MEDIA_ENT_T_V4L2_SUBDEV)
+       if (!is_media_entity_v4l2_subdev(source))
                return 0;
 
        pipe->external = media_entity_to_v4l2_subdev(source);

diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index a87ac16273a048a2a193689ab6c9505d3d11a617..05bfa9d08b19e5cc2853140289b80b4085e75dee 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -822,7 +822,7 @@ static int camif_pipeline_validate(struct camif_dev *camif)
 
        /* Retrieve format at the sensor subdev source pad */
        pad = media_entity_remote_pad(&camif->pads[0]);
-       if (!pad || media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+       if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                return -EPIPE;
 
        src_fmt.pad = pad->index;

diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index c2b2281bb5306dfc92b1d894a6424151899dbe07..024d10de3740dc14fd551cd36d49dc295898f297 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -160,8 +160,7 @@ vsp1_video_remote_subdev(struct media_pad *local, u32 *pad)
        struct media_pad *remote;
 
        remote = media_entity_remote_pad(local);
-       if (remote == NULL ||
-           media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+       if (!remote || !is_media_entity_v4l2_subdev(remote->entity))
                return NULL;
 
        if (pad)
@@ -297,7 +296,7 @@ static int vsp1_pipeline_validate_branch(struct vsp1_pipeline *pipe,
                        return -EPIPE;
 
                /* We've reached a video node, that shouldn't have happened. */
-               if (media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!is_media_entity_v4l2_subdev(pad->entity))
                        return -EPIPE;
 
                entity = to_vsp1_entity(media_entity_to_v4l2_subdev(pad->entity));
@@ -394,7 +393,7 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
                struct vsp1_rwpf *rwpf;
                struct vsp1_entity *e;
 
-               if (media_entity_type(entity) != MEDIA_ENT_T_V4L2_SUBDEV) {
+               if (is_media_entity_v4l2_io(entity)) {
                        pipe->num_video++;
                        continue;
                }
@@ -663,7 +662,7 @@ void vsp1_pipeline_propagate_alpha(struct vsp1_pipeline *pipe,
        pad = media_entity_remote_pad(&input->pads[RWPF_PAD_SOURCE]);
 
        while (pad) {
-               if (media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                entity = to_vsp1_entity(media_entity_to_v4l2_subdev(pad->entity));

diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 9c8b2725425361878130fdff7ae273d0921e3eaa..b3fb1570b1892d6e476c2e4aeb57d481863eceef 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -49,8 +49,7 @@ xvip_dma_remote_subdev(struct media_pad *local, u32 *pad)
        struct media_pad *remote;
 
        remote = media_entity_remote_pad(local);
-       if (remote == NULL ||
-           media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+       if (!remote || !is_media_entity_v4l2_subdev(remote->entity))
                return NULL;
 
        if (pad)
@@ -113,8 +112,7 @@ static int xvip_pipeline_start_stop(struct xvip_pipeline *pipe, bool start)
                        break;
 
                pad = media_entity_remote_pad(pad);
-               if (pad == NULL ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                entity = pad->entity;

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index e6e1115d82150b1effa865b1be2d593b7418be33..60da43772de992a56852a49b4a42fbbde04ed5fd 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -526,7 +526,7 @@ static int
 v4l2_subdev_link_validate_get_format(struct media_pad *pad,
                                     struct v4l2_subdev_format *fmt)
 {
-       if (media_entity_type(pad->entity) == MEDIA_ENT_T_V4L2_SUBDEV) {
+       if (is_media_entity_v4l2_subdev(pad->entity)) {
                struct v4l2_subdev *sd =
                        media_entity_to_v4l2_subdev(pad->entity);
 

diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 6e0d0375634d1e32d02f76d4f091004d33a03d66..d21d978e139e92482ddac2797549289e23163fca 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -148,7 +148,7 @@ static void vpfe_prepare_pipeline(struct vpfe_video_device *video)
        while ((entity = media_entity_graph_walk_next(&graph))) {
                if (entity == &video->video_dev.entity)
                        continue;
-               if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)
+               if ((!is_media_entity_v4l2_io(remote->entity))
                        continue;
                far_end = to_vpfe_video(media_entity_to_video_device(entity));
                if (far_end->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
@@ -293,7 +293,7 @@ static int vpfe_pipeline_enable(struct vpfe_pipeline *pipe)
        media_entity_graph_walk_start(&graph, entity);
        while ((entity = media_entity_graph_walk_next(&graph))) {
 
-               if (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE)
+               if !is_media_entity_v4l2_subdev(entity))
                        continue;
                subdev = media_entity_to_v4l2_subdev(entity);
                ret = v4l2_subdev_call(subdev, video, s_stream, 1);
@@ -334,7 +334,7 @@ static int vpfe_pipeline_disable(struct vpfe_pipeline *pipe)
 
        while ((entity = media_entity_graph_walk_next(&graph))) {
 
-               if (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE)
+               if (!is_media_entity_v4l2_subdev(entity))
                        continue;
                subdev = media_entity_to_v4l2_subdev(entity);
                ret = v4l2_subdev_call(subdev, video, s_stream, 0);

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index fa761669fd863e05d31f93d09a05bf2eb0dfe6f4..28e4d16544eb67f7e0e11039bacee4aa20c051b9 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -397,7 +397,7 @@ static int iss_pipeline_pm_use_count(struct media_entity *entity)
        media_entity_graph_walk_start(&graph, entity);
 
        while ((entity = media_entity_graph_walk_next(&graph))) {
-               if (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE)
+               if (is_media_entity_v4l2_io(entity))
                        use += entity->use_count;
        }
 
@@ -419,7 +419,7 @@ static int iss_pipeline_pm_power_one(struct media_entity *entity, int change)
 {
        struct v4l2_subdev *subdev;
 
-       subdev = media_entity_type(entity) == MEDIA_ENT_T_V4L2_SUBDEV
+       subdev = is_media_entity_v4l2_subdev(entity)
               ? media_entity_to_v4l2_subdev(entity) : NULL;
 
        if (entity->use_count == 0 && change > 0 && subdev) {
@@ -461,7 +461,7 @@ static int iss_pipeline_pm_power(struct media_entity *entity, int change)
        media_entity_graph_walk_start(&graph, entity);
 
        while (!ret && (entity = media_entity_graph_walk_next(&graph)))
-               if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)
+               if (is_media_entity_v4l2_subdev(entity))
                        ret = iss_pipeline_pm_power_one(entity, change);
 
        if (!ret)
@@ -471,7 +471,7 @@ static int iss_pipeline_pm_power(struct media_entity *entity, int change)
 
        while ((first = media_entity_graph_walk_next(&graph)) &&
               first != entity)
-               if (media_entity_type(first) != MEDIA_ENT_T_DEVNODE)
+               if (is_media_entity_v4l2_subdev(first))
                        iss_pipeline_pm_power_one(first, -change);
 
        return ret;
@@ -590,8 +590,7 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe,
                        break;
 
                pad = media_entity_remote_pad(pad);
-               if (!pad ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                entity = pad->entity;
@@ -658,8 +657,7 @@ static int iss_pipeline_enable(struct iss_pipeline *pipe,
                        break;
 
                pad = media_entity_remote_pad(pad);
-               if (!pad ||
-                   media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+               if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
                        break;
 
                entity = pad->entity;

diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index ea384630aab0e25e34752bb74db4f20c29064c27..60b7a58e6122deeb0bca7fd528654048f55282fe 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -190,8 +190,7 @@ iss_video_remote_subdev(struct iss_video *video, u32 *pad)
 
        remote = media_entity_remote_pad(&video->pad);
 
-       if (!remote ||
-           media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
+       if (!remote || !is_media_entity_v4l2_subdev(remote->entity))
                return NULL;
 
        if (pad)
@@ -216,7 +215,7 @@ iss_video_far_end(struct iss_video *video)
                if (entity == &video->video.entity)
                        continue;
 
-               if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)
+               if (!is_media_entity_v4l2_io(entity))
                        continue;
 
                far_end = to_iss_video(media_entity_to_video_device(entity));