MC next generation patches

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.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/common.c index 0eb34ecb8ee4..8c9a29e0e294 100644

drivers/media/platform/exynos4-is/common.c +1 -2

@@ -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);

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/fimc-capture.c index 0627a93b2f3b..e9810fee4c30 100644

drivers/media/platform/exynos4-is/fimc-capture.c +2 -3

@@ -1141,8 +1141,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 */

@@ -1397,7 +1396,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))

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/fimc-isp-video.c index 3d9ccbf5f10f..5fbaf5e39903 100644

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

@@ -467,8 +467,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;
 

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

 		sd = media_entity_to_v4l2_subdev(pad->entity);

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/fimc-lite.c index b2607da4ad14..c2327147b360 100644

drivers/media/platform/exynos4-is/fimc-lite.c +2 -4

@@ -814,8 +814,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);

@@ -988,7 +987,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))

@@ -1000,7 +998,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;

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

 		}

@@ -1018,7 +1016,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;

@@ -1027,7 +1025,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;

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/media-dev.c index 92dbade2fffc..4a25df9dd869 100644

drivers/media/platform/exynos4-is/media-dev.c +2 -3

@@ -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;
 

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

 		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;
 

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

 		__fimc_md_modify_pipeline(entity_err, !enable);

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/isp.c index 69e7733d36cd..cb8ac90086c1 100644

drivers/media/platform/omap3isp/isp.c +4 -4

@@ -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);
 

drivers/media/platform/omap3isp/isp.c +2 -4

 	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;

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispvideo.c index 4c367352b1f7..52843ac2a9ca 100644

drivers/media/platform/omap3isp/ispvideo.c +1 -2

@@ -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;
 

drivers/media/platform/omap3isp/ispvideo.c +2 -2

 	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));

@@ -917,7 +916,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);

(quoted diff) +0 -0

b/drivers/media/platform/s3c-camif/camif-capture.c index eae667eab1b9..fb5b016cc0a1 100644

drivers/media/platform/s3c-camif/camif-capture.c +1 -1

@@ -837,7 +837,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;
 

drivers/media/platform/s3c-camif/camif-capture.c +0 -0

 	src_fmt.pad = pad->index;

(quoted diff) +0 -0

b/drivers/media/platform/vsp1/vsp1_video.c index 1f94c1a54e00..f74158224b93 100644

drivers/media/platform/vsp1/vsp1_video.c +4 -5

@@ -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)

@@ -326,7 +325,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));

@@ -423,7 +422,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;
 		}

@@ -692,7 +691,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));

(quoted diff) +0 -0

b/drivers/media/platform/xilinx/xilinx-dma.c index 88cd789cdaf7..8e14841bf445 100644

drivers/media/platform/xilinx/xilinx-dma.c +2 -4

@@ -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;

(quoted diff) +0 -0

b/drivers/media/v4l2-core/v4l2-subdev.c index e6e1115d8215..60da43772de9 100644

drivers/media/v4l2-core/v4l2-subdev.c +1 -1

@@ -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);
 

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 92573fa852a9..16763e0831f2 100644

drivers/staging/media/davinci_vpfe/vpfe_video.c +0 -0

@@ -148,7 +148,7 @@ static void vpfe_prepare_pipeline(struct

vpfe_video_device *video) while ((entity =
media_entity_graph_walk_next(&graph))) {

drivers/staging/media/davinci_vpfe/vpfe_video.c +1 -1

 		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)

drivers/staging/media/davinci_vpfe/vpfe_video.c +1 -1

 			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);

drivers/staging/media/davinci_vpfe/vpfe_video.c +0 -0

 		ret = v4l2_subdev_call(subdev, video, s_stream, 0);

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss.c index 40591963b42b..44b88ff3ba83 100644

drivers/staging/media/omap4iss/iss.c +4 -4

@@ -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 != NULL) {

@@ -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);
 

drivers/staging/media/omap4iss/iss.c +2 -4

 	return ret;

@@ -590,8 +590,7 @@ static int iss_pipeline_disable(struct iss_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;

@@ -658,8 +657,7 @@ static int iss_pipeline_enable(struct iss_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;

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_video.c index 45a3f2d778fc..cbe5783735dc 100644

drivers/staging/media/omap4iss/iss_video.c +1 -2

@@ -191,8 +191,7 @@ iss_video_remote_subdev(struct iss_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;
 

drivers/staging/media/omap4iss/iss_video.c +1 -1

 	if (pad)

@@ -217,7 +216,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));

Hi Mauro,

Thank you for the patch.

Quoted 364 lines · On Sunday 30 August 2015 00:06:43 Mauro Carvalho Chehab wrote:

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.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/common.c index 0eb34ecb8ee4..8c9a29e0e294 100644

drivers/media/platform/exynos4-is/common.c +1 -2

@@ -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);

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/fimc-capture.c index 0627a93b2f3b..e9810fee4c30 100644

drivers/media/platform/exynos4-is/fimc-capture.c +2 -3

@@ -1141,8 +1141,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 */

@@ -1397,7 +1396,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))

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/fimc-isp-video.c index 3d9ccbf5f10f..5fbaf5e39903 100644

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

@@ -467,8 +467,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;
 

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

 		sd = media_entity_to_v4l2_subdev(pad->entity);

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/fimc-lite.c index b2607da4ad14..c2327147b360 100644

drivers/media/platform/exynos4-is/fimc-lite.c +2 -4

@@ -814,8 +814,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);

@@ -988,7 +987,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))

@@ -1000,7 +998,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;

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

 		}

@@ -1018,7 +1016,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;

@@ -1027,7 +1025,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;

(quoted diff) +0 -0

b/drivers/media/platform/exynos4-is/media-dev.c index 92dbade2fffc..4a25df9dd869 100644

drivers/media/platform/exynos4-is/media-dev.c +2 -3

@@ -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;
 

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

 		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;
 

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

 		__fimc_md_modify_pipeline(entity_err, !enable);

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/isp.c index 69e7733d36cd..cb8ac90086c1 100644

drivers/media/platform/omap3isp/isp.c +4 -4

@@ -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);
 

drivers/media/platform/omap3isp/isp.c +2 -4

 	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;

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispvideo.c index 4c367352b1f7..52843ac2a9ca 100644

drivers/media/platform/omap3isp/ispvideo.c +1 -2

@@ -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;
 

drivers/media/platform/omap3isp/ispvideo.c +2 -2

 	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));

@@ -917,7 +916,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);

(quoted diff) +0 -0

b/drivers/media/platform/s3c-camif/camif-capture.c index eae667eab1b9..fb5b016cc0a1 100644

drivers/media/platform/s3c-camif/camif-capture.c +1 -1

@@ -837,7 +837,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;
 

drivers/media/platform/s3c-camif/camif-capture.c +0 -0

 	src_fmt.pad = pad->index;

(quoted diff) +0 -0

b/drivers/media/platform/vsp1/vsp1_video.c index 1f94c1a54e00..f74158224b93 100644

drivers/media/platform/vsp1/vsp1_video.c +4 -5

@@ -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)

@@ -326,7 +325,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));

@@ -423,7 +422,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;
 		}

@@ -692,7 +691,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));

(quoted diff) +0 -0

b/drivers/media/platform/xilinx/xilinx-dma.c index 88cd789cdaf7..8e14841bf445 100644

drivers/media/platform/xilinx/xilinx-dma.c +2 -4

@@ -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;

(quoted diff) +0 -0

b/drivers/media/v4l2-core/v4l2-subdev.c index e6e1115d8215..60da43772de9 100644

drivers/media/v4l2-core/v4l2-subdev.c +1 -1

@@ -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);
 

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 92573fa852a9..16763e0831f2 100644

drivers/staging/media/davinci_vpfe/vpfe_video.c +0 -0

@@ -148,7 +148,7 @@ static void vpfe_prepare_pipeline(struct

vpfe_video_device *video) while ((entity =
media_entity_graph_walk_next(&graph))) {

drivers/staging/media/davinci_vpfe/vpfe_video.c +1 -1

 		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)

drivers/staging/media/davinci_vpfe/vpfe_video.c static int vpfe_pipeline_enable(struct vpfe_pipeline · line 296

Quoted 5 lines

drivers/staging/media/davinci_vpfe/vpfe_video.c +1 -1

@@ -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))

With these two chunks fixed,

Acked-by Laurent Pinchart <[email protected]>

I'm wondering, however, why you replace some occurrences of == MEDIA_ENT_T_DEVNODE with !is_media_entity_v4l2_subdev and some other with is_media_entity_v4l2_io.

Quoted 101 lines

drivers/staging/media/davinci_vpfe/vpfe_video.c +1 -1

 			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);

drivers/staging/media/davinci_vpfe/vpfe_video.c +0 -0

 		ret = v4l2_subdev_call(subdev, video, s_stream, 0);

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss.c index 40591963b42b..44b88ff3ba83 100644

drivers/staging/media/omap4iss/iss.c +4 -4

@@ -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 != NULL) {

@@ -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);
 

drivers/staging/media/omap4iss/iss.c +2 -4

 	return ret;

@@ -590,8 +590,7 @@ static int iss_pipeline_disable(struct iss_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;

@@ -658,8 +657,7 @@ static int iss_pipeline_enable(struct iss_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;

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_video.c index 45a3f2d778fc..cbe5783735dc 100644

drivers/staging/media/omap4iss/iss_video.c +1 -2

@@ -191,8 +191,7 @@ iss_video_remote_subdev(struct iss_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;
 

drivers/staging/media/omap4iss/iss_video.c +1 -1

 	if (pad)

@@ -217,7 +216,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));

On omap3/omap4/davinci drivers, MEDIA_ENT_T_V4L2_SUBDEV macro is abused in order to "simplify" the pad checks.

Basically, it does a logical or of this macro, in order to check for a local index and if the entity is either a subdev or not.

As we'll get rid of MEDIA_ENT_T_V4L2_SUBDEV macro,

replace it by 2 << 16 where it occurs, and add a note saying that the code there is actually a hack.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispccdc.c index
9a811f5741fa..f0e530c98188 100644

drivers/media/platform/omap3isp/ispccdc.c +2 -0

+	switch (index) {
+	case CCDC_PAD_SINK | 2 << 16:
 		/* Read from the sensor (parallel interface), CCP2, CSI2a or
 		 * CSI2c.
 		 */

@@ -2543,7 +2548,7 @@ static int ccdc_link_setup(struct media_entity
 *entity, * Revisit this when it will be implemented, and return -EBUSY for

now. */

drivers/media/platform/omap3isp/ispccdc.c +3 -3

-	case CCDC_PAD_SOURCE_VP | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CCDC_PAD_SOURCE_VP | 2 << 16:
 		/* Write to preview engine, histogram and H3A. When none of
 		 * those links are active, the video port can be disabled.
 		 */

@@ -2556,7 +2561,7 @@ static int ccdc_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case CCDC_PAD_SOURCE_OF | MEDIA_ENT_T_DEVNODE:
+	case CCDC_PAD_SOURCE_OF:
 		/* Write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ccdc->output & ~CCDC_OUTPUT_MEMORY)

@@ -2567,7 +2572,7 @@ static int ccdc_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case CCDC_PAD_SOURCE_OF | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CCDC_PAD_SOURCE_OF | 2 << 16:
 		/* Write to resizer */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ccdc->output & ~CCDC_OUTPUT_RESIZER)

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispccp2.c index
6ec7d104ab75..ae3038e643cc 100644

drivers/media/platform/omap3isp/ispccp2.c +9 -4

@@ -956,9 +956,14 @@ static int ccp2_link_setup(struct media_entity *entity,
 {
 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_ccp2_device *ccp2 = v4l2_get_subdevdata(sd);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case CCP2_PAD_SINK | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case CCP2_PAD_SINK:
 		/* read from memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ccp2->input == CCP2_INPUT_SENSOR)

@@ -970,7 +975,7 @@ static int ccp2_link_setup(struct media_entity *entity,
 		}
 		break;
 
-	case CCP2_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CCP2_PAD_SINK | 2 << 16:
 		/* read from sensor/phy */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ccp2->input == CCP2_INPUT_MEMORY)

@@ -981,7 +986,7 @@ static int ccp2_link_setup(struct media_entity *entity,
 				ccp2->input = CCP2_INPUT_NONE;
 		} break;
 
-	case CCP2_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CCP2_PAD_SOURCE | 2 << 16:
 		/* write to video port/ccdc */
 		if (flags & MEDIA_LNK_FL_ENABLED)
 			ccp2->output = CCP2_OUTPUT_CCDC;

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispcsi2.c index
0fb057a74f69..b1617f7efdee 100644

drivers/media/platform/omap3isp/ispcsi2.c +8 -3

@@ -1144,14 +1144,19 @@ static int csi2_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_csi2_device *csi2 = v4l2_get_subdevdata(sd);
 	struct isp_csi2_ctrl_cfg *ctrl = &csi2->ctrl;
+	int index = local->index;
 
 	/*
 	 * The ISP core doesn't support pipelines with multiple video outputs.
 	 * Revisit this when it will be implemented, and return -EBUSY for now.
 	 */
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case CSI2_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case CSI2_PAD_SOURCE:
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (csi2->output & ~CSI2_OUTPUT_MEMORY)
 				return -EBUSY;

@@ -1161,7 +1166,7 @@ static int csi2_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case CSI2_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CSI2_PAD_SOURCE | 2 << 16:
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (csi2->output & ~CSI2_OUTPUT_CCDC)
 				return -EBUSY;

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/isppreview.c index 6986d2f65c19..cfb2debb02bf 100644

drivers/media/platform/omap3isp/isppreview.c +8 -3

@@ -2144,9 +2144,14 @@ static int preview_link_setup(struct media_entity
 *entity, {
 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_prev_device *prev = v4l2_get_subdevdata(sd);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case PREV_PAD_SINK | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case PREV_PAD_SINK:
 		/* read from memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (prev->input == PREVIEW_INPUT_CCDC)

@@ -2158,7 +2163,7 @@ static int preview_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case PREV_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	case PREV_PAD_SINK | 2 << 16:
 		/* read from ccdc */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (prev->input == PREVIEW_INPUT_MEMORY)

@@ -2175,7 +2180,7 @@ static int preview_link_setup(struct media_entity
 *entity, * Revisit this when it will be implemented, and return -EBUSY for

now. */

drivers/media/platform/omap3isp/isppreview.c +2 -2

-	case PREV_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	case PREV_PAD_SOURCE:
 		/* write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (prev->output & ~PREVIEW_OUTPUT_MEMORY)

@@ -2186,7 +2191,7 @@ static int preview_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case PREV_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case PREV_PAD_SOURCE | 2 << 16:
 		/* write to resizer */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (prev->output & ~PREVIEW_OUTPUT_RESIZER)

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispresizer.c index 249af7f524f9..e3ecf1787fc4 100644

drivers/media/platform/omap3isp/ispresizer.c +9 -4

@@ -1623,9 +1623,14 @@ static int resizer_link_setup(struct media_entity
 *entity, {
 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_res_device *res = v4l2_get_subdevdata(sd);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case RESZ_PAD_SINK | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case RESZ_PAD_SINK:
 		/* read from memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (res->input == RESIZER_INPUT_VP)

@@ -1637,7 +1642,7 @@ static int resizer_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case RESZ_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	case RESZ_PAD_SINK | 2 << 16:
 		/* read from ccdc or previewer */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (res->input == RESIZER_INPUT_MEMORY)

@@ -1649,7 +1654,7 @@ static int resizer_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case RESZ_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	case RESZ_PAD_SOURCE:
 		/* resizer always write to memory */
 		break;
 

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c index d96bdaaae50e..b66584ecb693 100644

drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +0 -0

@@ -885,9 +885,14 @@ ipipeif_link_setup(struct media_entity *entity, const

struct media_pad *local, struct v4l2_subdev *sd =
media_entity_to_v4l2_subdev(entity);

drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +9 -4

 	struct vpfe_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);
 	struct vpfe_device *vpfe = to_vpfe_device(ipipeif);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case IPIPEIF_PAD_SINK | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case IPIPEIF_PAD_SINK:
 		/* Single shot mode */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipeif->input = IPIPEIF_INPUT_NONE;

@@ -896,7 +901,7 @@ ipipeif_link_setup(struct media_entity *entity, const
 struct media_pad *local, ipipeif->input = IPIPEIF_INPUT_MEMORY;
 		break;
 
-	case IPIPEIF_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPEIF_PAD_SINK | 2 << 16:
 		/* read from isif */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipeif->input = IPIPEIF_INPUT_NONE;

@@ -908,7 +913,7 @@ ipipeif_link_setup(struct media_entity *entity, const
 struct media_pad *local, ipipeif->input = IPIPEIF_INPUT_ISIF;
 		break;
 
-	case IPIPEIF_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPEIF_PAD_SOURCE | 2 << 16:
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipeif->output = IPIPEIF_OUTPUT_NONE;
 			break;

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/dm365_isif.c index df77288b0ec0..8ca0c1297ec8 100644

drivers/staging/media/davinci_vpfe/dm365_isif.c +9 -4

@@ -1707,9 +1707,14 @@ isif_link_setup(struct media_entity *entity, const
 struct media_pad *local, {
 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct vpfe_isif_device *isif = v4l2_get_subdevdata(sd);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case ISIF_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case ISIF_PAD_SINK | 2 << 16:
 		/* read from decoder/sensor */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			isif->input = ISIF_INPUT_NONE;

@@ -1720,7 +1725,7 @@ isif_link_setup(struct media_entity *entity, const
 struct media_pad *local, isif->input = ISIF_INPUT_PARALLEL;
 		break;
 
-	case ISIF_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	case ISIF_PAD_SOURCE:
 		/* write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED)
 			isif->output = ISIF_OUTPUT_MEMORY;

@@ -1728,7 +1733,7 @@ isif_link_setup(struct media_entity *entity, const
 struct media_pad *local, isif->output = ISIF_OUTPUT_NONE;
 		break;
 
-	case ISIF_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case ISIF_PAD_SOURCE | 2 << 16:
 		if (flags & MEDIA_LNK_FL_ENABLED)
 			isif->output = ISIF_OUTPUT_IPIPEIF;
 		else

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/dm365_resizer.c index ae942de3a23d..8eb6f5fda21c 100644

drivers/staging/media/davinci_vpfe/dm365_resizer.c +15 -10

@@ -1653,10 +1653,15 @@ static int resizer_link_setup(struct media_entity
 *entity, struct vpfe_device *vpfe_dev = to_vpfe_device(resizer);
 	u16 ipipeif_source = vpfe_dev->vpfe_ipipeif.output;
 	u16 ipipe_source = vpfe_dev->vpfe_ipipe.output;
+	int index = local->index;
+
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
 
 	if (&resizer->crop_resizer.subdev == sd) {
-		switch (local->index | media_entity_type(remote->entity)) {
-		case RESIZER_CROP_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+		switch (index) {
+		case RESIZER_CROP_PAD_SINK | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->crop_resizer.input =
 					RESIZER_CROP_INPUT_NONE;

@@ -1676,7 +1681,7 @@ static int resizer_link_setup(struct media_entity
 *entity, return -EINVAL;
 			break;
 
-		case RESIZER_CROP_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+		case RESIZER_CROP_PAD_SOURCE | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->crop_resizer.output =
 				RESIZER_CROP_OUTPUT_NONE;

@@ -1688,7 +1693,7 @@ static int resizer_link_setup(struct media_entity
 *entity, resizer->crop_resizer.output = RESIZER_A;
 			break;
 
-		case RESIZER_CROP_PAD_SOURCE2 | MEDIA_ENT_T_V4L2_SUBDEV:
+		case RESIZER_CROP_PAD_SOURCE2 | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->crop_resizer.output2 =
 					RESIZER_CROP_OUTPUT_NONE;

@@ -1704,8 +1709,8 @@ static int resizer_link_setup(struct media_entity
 *entity, return -EINVAL;
 		}
 	} else if (&resizer->resizer_a.subdev == sd) {
-		switch (local->index | media_entity_type(remote->entity)) {
-		case RESIZER_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+		switch (index) {
+		case RESIZER_PAD_SINK | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->resizer_a.input = RESIZER_INPUT_NONE;
 				break;

@@ -1715,7 +1720,7 @@ static int resizer_link_setup(struct media_entity
 *entity, resizer->resizer_a.input = RESIZER_INPUT_CROP_RESIZER;
 			break;
 
-		case RESIZER_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+		case RESIZER_PAD_SOURCE:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->resizer_a.output = RESIZER_OUTPUT_NONE;
 				break;

@@ -1729,8 +1734,8 @@ static int resizer_link_setup(struct media_entity
 *entity, return -EINVAL;
 		}
 	} else if (&resizer->resizer_b.subdev == sd) {
-		switch (local->index | media_entity_type(remote->entity)) {
-		case RESIZER_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+		switch (index) {
+		case RESIZER_PAD_SINK | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->resizer_b.input = RESIZER_INPUT_NONE;
 				break;

@@ -1740,7 +1745,7 @@ static int resizer_link_setup(struct media_entity
 *entity, resizer->resizer_b.input = RESIZER_INPUT_CROP_RESIZER;
 			break;
 
-		case RESIZER_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+		case RESIZER_PAD_SOURCE:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->resizer_b.output = RESIZER_OUTPUT_NONE;
 				break;

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 16763e0831f2..9eef64e0f0ab 100644

drivers/staging/media/davinci_vpfe/vpfe_video.c +0 -0

@@ -148,7 +148,7 @@ static void vpfe_prepare_pipeline(struct

vpfe_video_device *video) while ((entity =
media_entity_graph_walk_next(&graph))) {

drivers/staging/media/davinci_vpfe/vpfe_video.c +2 -2

 		if (entity == &video->video_dev.entity)
 			continue;
-		if ((!is_media_entity_v4l2_io(remote->entity))
+		if (!is_media_entity_v4l2_io(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 !is_media_entity_v4l2_subdev(entity))
+		if (!is_media_entity_v4l2_subdev(entity))
 			continue;
 		subdev = media_entity_to_v4l2_subdev(entity);
 		ret = v4l2_subdev_call(subdev, video, s_stream, 1);

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_csi2.c index
6b4dcbfa9425..50a24e8e8129 100644

drivers/staging/media/omap4iss/iss_csi2.c +8 -3

@@ -1170,14 +1170,19 @@ static int csi2_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct iss_csi2_device *csi2 = v4l2_get_subdevdata(sd);
 	struct iss_csi2_ctrl_cfg *ctrl = &csi2->ctrl;
+	int index = local->index;
+
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
 
 	/*
 	 * The ISS core doesn't support pipelines with multiple video outputs.
 	 * Revisit this when it will be implemented, and return -EBUSY for now.
 	 */
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case CSI2_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	switch (index) {
+	case CSI2_PAD_SOURCE:
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (csi2->output & ~CSI2_OUTPUT_MEMORY)
 				return -EBUSY;

@@ -1187,7 +1192,7 @@ static int csi2_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case CSI2_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CSI2_PAD_SOURCE | 2 << 16:
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (csi2->output & ~CSI2_OUTPUT_IPIPEIF)
 				return -EBUSY;

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_ipipeif.c index 44c432ef2ac5..e46b2c07bd5d 100644

drivers/staging/media/omap4iss/iss_ipipeif.c +8 -3

@@ -662,9 +662,14 @@ static int ipipeif_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);
 	struct iss_device *iss = to_iss_device(ipipeif);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case IPIPEIF_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case IPIPEIF_PAD_SINK | 2 << 16:
 		/* Read from the sensor CSI2a or CSI2b. */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipeif->input = IPIPEIF_INPUT_NONE;

@@ -681,7 +686,7 @@ static int ipipeif_link_setup(struct media_entity
 *entity,
 
 		break;
 
-	case IPIPEIF_PAD_SOURCE_ISIF_SF | MEDIA_ENT_T_DEVNODE:
+	case IPIPEIF_PAD_SOURCE_ISIF_SF:
 		/* Write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {

drivers/staging/media/omap4iss/iss_ipipeif.c +1 -1

 			if (ipipeif->output & ~IPIPEIF_OUTPUT_MEMORY)

@@ -692,7 +697,7 @@ static int ipipeif_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case IPIPEIF_PAD_SOURCE_VP | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPEIF_PAD_SOURCE_VP | 2 << 16:
 		/* Send to IPIPE/RESIZER */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ipipeif->output & ~IPIPEIF_OUTPUT_VP)

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_resizer.c index b659e465cb56..bc5001002cc5 100644

drivers/staging/media/omap4iss/iss_resizer.c +7 -2

@@ -717,9 +717,14 @@ static int resizer_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd);
 	struct iss_device *iss = to_iss_device(resizer);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case RESIZER_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case RESIZER_PAD_SINK | 2 << 16:
 		/* Read from IPIPE or IPIPEIF. */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			resizer->input = RESIZER_INPUT_NONE;

drivers/staging/media/omap4iss/iss_resizer.c +0 -0

 		/* Write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {

if (resizer->output & ~RESIZER_OUTPUT_MEMORY)

Hi Mauro,

Thank you for the patch.

Quoted 2 lines · On Sunday 30 August 2015 00:06:44 Mauro Carvalho Chehab wrote:

On omap3/omap4/davinci drivers, MEDIA_ENT_T_V4L2_SUBDEV macro is abused in order to "simplify" the pad checks.

As explained in a couple of other replies to similar patches, it's not a hack :-)

Quoted 5 lines

Basically, it does a logical or of this macro, in order to check for a local index and if the entity is either a subdev or not.

As we'll get rid of MEDIA_ENT_T_V4L2_SUBDEV macro,

This is the reason for this patch, and I agree with it.

Quoted 5 lines

replace it by 2 << 16 where it occurs, and add a note saying that the code there is actually a hack.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

drivers/media/platform/omap3isp/ispccdc.c static int ccdc_link_setup(struct media_entity · line 2516

Quoted 10 lines

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispccdc.c index
9a811f5741fa..f0e530c98188 100644

drivers/media/platform/omap3isp/ispccdc.c +1 -0

@@ -2513,9 +2513,14 @@ static int ccdc_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd);
 	struct isp_device *isp = to_isp_device(ccdc);
+	int index = local->index;

The index can never be negative, you can use unsigned int.

drivers/media/platform/omap3isp/ispccdc.c static int ccdc_link_setup(struct media_entity *entity, · line 2518

Quoted 5 lines

drivers/media/platform/omap3isp/ispccdc.c +1 -2

-	switch (local->index | media_entity_type(remote->entity)) {
-	case CCDC_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	/* FIXME: this is actually a hack! */

Please, let's not introduce a hack to replace valid code. I'm certainly fine with removing usage of MEDIA_ENT_T_V4L2_SUBDEV, but drivers should be modified cleanly.

If you rename the index variable to link and use a macro (I would call it LINK_TO_SUBDEV for instance) instead of 2 << 16 the implementation wouldn't be that bad, as what the switch operates on is the link, not the pad. I would also create a LINK_TO_DEVNODE macro, even if it evaluates to 0, to clearly label each case.

drivers/media/platform/omap3isp/ispccdc.c static int ccdc_link_setup(struct media_entity · line 2519

Quoted 3 lines

drivers/media/platform/omap3isp/ispccdc.c +2 -0

+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;

Why 2 << 16 and not 1 << 16 ?

Same comments for all the other files below (but please see the very end for one last comment).

Quoted 485 lines

drivers/media/platform/omap3isp/ispccdc.c +2 -0

+	switch (index) {
+	case CCDC_PAD_SINK | 2 << 16:
 		/* Read from the sensor (parallel interface), CCP2, CSI2a or
 		 * CSI2c.
 		 */

@@ -2543,7 +2548,7 @@ static int ccdc_link_setup(struct media_entity
 *entity, * Revisit this when it will be implemented, and return -EBUSY for

now. */

drivers/media/platform/omap3isp/ispccdc.c +3 -3

-	case CCDC_PAD_SOURCE_VP | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CCDC_PAD_SOURCE_VP | 2 << 16:
 		/* Write to preview engine, histogram and H3A. When none of
 		 * those links are active, the video port can be disabled.
 		 */

@@ -2556,7 +2561,7 @@ static int ccdc_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case CCDC_PAD_SOURCE_OF | MEDIA_ENT_T_DEVNODE:
+	case CCDC_PAD_SOURCE_OF:
 		/* Write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ccdc->output & ~CCDC_OUTPUT_MEMORY)

@@ -2567,7 +2572,7 @@ static int ccdc_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case CCDC_PAD_SOURCE_OF | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CCDC_PAD_SOURCE_OF | 2 << 16:
 		/* Write to resizer */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ccdc->output & ~CCDC_OUTPUT_RESIZER)

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispccp2.c index
6ec7d104ab75..ae3038e643cc 100644

drivers/media/platform/omap3isp/ispccp2.c +9 -4

@@ -956,9 +956,14 @@ static int ccp2_link_setup(struct media_entity *entity,
 {
 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_ccp2_device *ccp2 = v4l2_get_subdevdata(sd);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case CCP2_PAD_SINK | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case CCP2_PAD_SINK:
 		/* read from memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ccp2->input == CCP2_INPUT_SENSOR)

@@ -970,7 +975,7 @@ static int ccp2_link_setup(struct media_entity *entity,
 		}
 		break;
 
-	case CCP2_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CCP2_PAD_SINK | 2 << 16:
 		/* read from sensor/phy */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ccp2->input == CCP2_INPUT_MEMORY)

@@ -981,7 +986,7 @@ static int ccp2_link_setup(struct media_entity *entity,
 				ccp2->input = CCP2_INPUT_NONE;
 		} break;
 
-	case CCP2_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CCP2_PAD_SOURCE | 2 << 16:
 		/* write to video port/ccdc */
 		if (flags & MEDIA_LNK_FL_ENABLED)
 			ccp2->output = CCP2_OUTPUT_CCDC;

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispcsi2.c index
0fb057a74f69..b1617f7efdee 100644

drivers/media/platform/omap3isp/ispcsi2.c +8 -3

@@ -1144,14 +1144,19 @@ static int csi2_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_csi2_device *csi2 = v4l2_get_subdevdata(sd);
 	struct isp_csi2_ctrl_cfg *ctrl = &csi2->ctrl;
+	int index = local->index;
 
 	/*
 	 * The ISP core doesn't support pipelines with multiple video outputs.
 	 * Revisit this when it will be implemented, and return -EBUSY for now.
 	 */
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case CSI2_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case CSI2_PAD_SOURCE:
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (csi2->output & ~CSI2_OUTPUT_MEMORY)
 				return -EBUSY;

@@ -1161,7 +1166,7 @@ static int csi2_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case CSI2_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CSI2_PAD_SOURCE | 2 << 16:
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (csi2->output & ~CSI2_OUTPUT_CCDC)
 				return -EBUSY;

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/isppreview.c index 6986d2f65c19..cfb2debb02bf 100644

drivers/media/platform/omap3isp/isppreview.c +8 -3

@@ -2144,9 +2144,14 @@ static int preview_link_setup(struct media_entity
 *entity, {
 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_prev_device *prev = v4l2_get_subdevdata(sd);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case PREV_PAD_SINK | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case PREV_PAD_SINK:
 		/* read from memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (prev->input == PREVIEW_INPUT_CCDC)

@@ -2158,7 +2163,7 @@ static int preview_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case PREV_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	case PREV_PAD_SINK | 2 << 16:
 		/* read from ccdc */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (prev->input == PREVIEW_INPUT_MEMORY)

@@ -2175,7 +2180,7 @@ static int preview_link_setup(struct media_entity
 *entity, * Revisit this when it will be implemented, and return -EBUSY for

now. */

drivers/media/platform/omap3isp/isppreview.c +2 -2

-	case PREV_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	case PREV_PAD_SOURCE:
 		/* write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (prev->output & ~PREVIEW_OUTPUT_MEMORY)

@@ -2186,7 +2191,7 @@ static int preview_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case PREV_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case PREV_PAD_SOURCE | 2 << 16:
 		/* write to resizer */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (prev->output & ~PREVIEW_OUTPUT_RESIZER)

(quoted diff) +0 -0

b/drivers/media/platform/omap3isp/ispresizer.c index 249af7f524f9..e3ecf1787fc4 100644

drivers/media/platform/omap3isp/ispresizer.c +9 -4

@@ -1623,9 +1623,14 @@ static int resizer_link_setup(struct media_entity
 *entity, {
 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct isp_res_device *res = v4l2_get_subdevdata(sd);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case RESZ_PAD_SINK | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case RESZ_PAD_SINK:
 		/* read from memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (res->input == RESIZER_INPUT_VP)

@@ -1637,7 +1642,7 @@ static int resizer_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case RESZ_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	case RESZ_PAD_SINK | 2 << 16:
 		/* read from ccdc or previewer */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (res->input == RESIZER_INPUT_MEMORY)

@@ -1649,7 +1654,7 @@ static int resizer_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case RESZ_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	case RESZ_PAD_SOURCE:
 		/* resizer always write to memory */
 		break;
 

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c index d96bdaaae50e..b66584ecb693 100644

drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +0 -0

@@ -885,9 +885,14 @@ ipipeif_link_setup(struct media_entity *entity, const

struct media_pad *local, struct v4l2_subdev *sd =
media_entity_to_v4l2_subdev(entity);

drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +9 -4

 	struct vpfe_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);
 	struct vpfe_device *vpfe = to_vpfe_device(ipipeif);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case IPIPEIF_PAD_SINK | MEDIA_ENT_T_DEVNODE:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case IPIPEIF_PAD_SINK:
 		/* Single shot mode */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipeif->input = IPIPEIF_INPUT_NONE;

@@ -896,7 +901,7 @@ ipipeif_link_setup(struct media_entity *entity, const
 struct media_pad *local, ipipeif->input = IPIPEIF_INPUT_MEMORY;
 		break;
 
-	case IPIPEIF_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPEIF_PAD_SINK | 2 << 16:
 		/* read from isif */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipeif->input = IPIPEIF_INPUT_NONE;

@@ -908,7 +913,7 @@ ipipeif_link_setup(struct media_entity *entity, const
 struct media_pad *local, ipipeif->input = IPIPEIF_INPUT_ISIF;
 		break;
 
-	case IPIPEIF_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPEIF_PAD_SOURCE | 2 << 16:
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipeif->output = IPIPEIF_OUTPUT_NONE;
 			break;

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/dm365_isif.c index df77288b0ec0..8ca0c1297ec8 100644

drivers/staging/media/davinci_vpfe/dm365_isif.c +9 -4

@@ -1707,9 +1707,14 @@ isif_link_setup(struct media_entity *entity, const
 struct media_pad *local, {
 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct vpfe_isif_device *isif = v4l2_get_subdevdata(sd);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case ISIF_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case ISIF_PAD_SINK | 2 << 16:
 		/* read from decoder/sensor */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			isif->input = ISIF_INPUT_NONE;

@@ -1720,7 +1725,7 @@ isif_link_setup(struct media_entity *entity, const
 struct media_pad *local, isif->input = ISIF_INPUT_PARALLEL;
 		break;
 
-	case ISIF_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	case ISIF_PAD_SOURCE:
 		/* write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED)
 			isif->output = ISIF_OUTPUT_MEMORY;

@@ -1728,7 +1733,7 @@ isif_link_setup(struct media_entity *entity, const
 struct media_pad *local, isif->output = ISIF_OUTPUT_NONE;
 		break;
 
-	case ISIF_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case ISIF_PAD_SOURCE | 2 << 16:
 		if (flags & MEDIA_LNK_FL_ENABLED)
 			isif->output = ISIF_OUTPUT_IPIPEIF;
 		else

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/dm365_resizer.c index ae942de3a23d..8eb6f5fda21c 100644

drivers/staging/media/davinci_vpfe/dm365_resizer.c +15 -10

@@ -1653,10 +1653,15 @@ static int resizer_link_setup(struct media_entity
 *entity, struct vpfe_device *vpfe_dev = to_vpfe_device(resizer);
 	u16 ipipeif_source = vpfe_dev->vpfe_ipipeif.output;
 	u16 ipipe_source = vpfe_dev->vpfe_ipipe.output;
+	int index = local->index;
+
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
 
 	if (&resizer->crop_resizer.subdev == sd) {
-		switch (local->index | media_entity_type(remote->entity)) {
-		case RESIZER_CROP_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+		switch (index) {
+		case RESIZER_CROP_PAD_SINK | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->crop_resizer.input =
 					RESIZER_CROP_INPUT_NONE;

@@ -1676,7 +1681,7 @@ static int resizer_link_setup(struct media_entity
 *entity, return -EINVAL;
 			break;
 
-		case RESIZER_CROP_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+		case RESIZER_CROP_PAD_SOURCE | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->crop_resizer.output =
 				RESIZER_CROP_OUTPUT_NONE;

@@ -1688,7 +1693,7 @@ static int resizer_link_setup(struct media_entity
 *entity, resizer->crop_resizer.output = RESIZER_A;
 			break;
 
-		case RESIZER_CROP_PAD_SOURCE2 | MEDIA_ENT_T_V4L2_SUBDEV:
+		case RESIZER_CROP_PAD_SOURCE2 | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->crop_resizer.output2 =
 					RESIZER_CROP_OUTPUT_NONE;

@@ -1704,8 +1709,8 @@ static int resizer_link_setup(struct media_entity
 *entity, return -EINVAL;
 		}
 	} else if (&resizer->resizer_a.subdev == sd) {
-		switch (local->index | media_entity_type(remote->entity)) {
-		case RESIZER_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+		switch (index) {
+		case RESIZER_PAD_SINK | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->resizer_a.input = RESIZER_INPUT_NONE;
 				break;

@@ -1715,7 +1720,7 @@ static int resizer_link_setup(struct media_entity
 *entity, resizer->resizer_a.input = RESIZER_INPUT_CROP_RESIZER;
 			break;
 
-		case RESIZER_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+		case RESIZER_PAD_SOURCE:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->resizer_a.output = RESIZER_OUTPUT_NONE;
 				break;

@@ -1729,8 +1734,8 @@ static int resizer_link_setup(struct media_entity
 *entity, return -EINVAL;
 		}
 	} else if (&resizer->resizer_b.subdev == sd) {
-		switch (local->index | media_entity_type(remote->entity)) {
-		case RESIZER_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+		switch (index) {
+		case RESIZER_PAD_SINK | 2 << 16:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->resizer_b.input = RESIZER_INPUT_NONE;
 				break;

@@ -1740,7 +1745,7 @@ static int resizer_link_setup(struct media_entity
 *entity, resizer->resizer_b.input = RESIZER_INPUT_CROP_RESIZER;
 			break;
 
-		case RESIZER_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+		case RESIZER_PAD_SOURCE:
 			if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 				resizer->resizer_b.output = RESIZER_OUTPUT_NONE;
 				break;

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 16763e0831f2..9eef64e0f0ab 100644

drivers/staging/media/davinci_vpfe/vpfe_video.c +0 -0

@@ -148,7 +148,7 @@ static void vpfe_prepare_pipeline(struct

vpfe_video_device *video) while ((entity =
media_entity_graph_walk_next(&graph))) {

drivers/staging/media/davinci_vpfe/vpfe_video.c +2 -2

 		if (entity == &video->video_dev.entity)
 			continue;
-		if ((!is_media_entity_v4l2_io(remote->entity))
+		if (!is_media_entity_v4l2_io(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 !is_media_entity_v4l2_subdev(entity))
+		if (!is_media_entity_v4l2_subdev(entity))
 			continue;
 		subdev = media_entity_to_v4l2_subdev(entity);
 		ret = v4l2_subdev_call(subdev, video, s_stream, 1);

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_csi2.c index
6b4dcbfa9425..50a24e8e8129 100644

drivers/staging/media/omap4iss/iss_csi2.c +8 -3

@@ -1170,14 +1170,19 @@ static int csi2_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct iss_csi2_device *csi2 = v4l2_get_subdevdata(sd);
 	struct iss_csi2_ctrl_cfg *ctrl = &csi2->ctrl;
+	int index = local->index;
+
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
 
 	/*
 	 * The ISS core doesn't support pipelines with multiple video outputs.
 	 * Revisit this when it will be implemented, and return -EBUSY for now.
 	 */
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case CSI2_PAD_SOURCE | MEDIA_ENT_T_DEVNODE:
+	switch (index) {
+	case CSI2_PAD_SOURCE:
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (csi2->output & ~CSI2_OUTPUT_MEMORY)
 				return -EBUSY;

@@ -1187,7 +1192,7 @@ static int csi2_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case CSI2_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case CSI2_PAD_SOURCE | 2 << 16:
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (csi2->output & ~CSI2_OUTPUT_IPIPEIF)
 				return -EBUSY;

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_ipipeif.c index 44c432ef2ac5..e46b2c07bd5d 100644

drivers/staging/media/omap4iss/iss_ipipeif.c +8 -3

@@ -662,9 +662,14 @@ static int ipipeif_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);
 	struct iss_device *iss = to_iss_device(ipipeif);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case IPIPEIF_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case IPIPEIF_PAD_SINK | 2 << 16:
 		/* Read from the sensor CSI2a or CSI2b. */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipeif->input = IPIPEIF_INPUT_NONE;

@@ -681,7 +686,7 @@ static int ipipeif_link_setup(struct media_entity
 *entity,
 
 		break;
 
-	case IPIPEIF_PAD_SOURCE_ISIF_SF | MEDIA_ENT_T_DEVNODE:
+	case IPIPEIF_PAD_SOURCE_ISIF_SF:
 		/* Write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {

drivers/staging/media/omap4iss/iss_ipipeif.c +1 -1

 			if (ipipeif->output & ~IPIPEIF_OUTPUT_MEMORY)

@@ -692,7 +697,7 @@ static int ipipeif_link_setup(struct media_entity
 *entity, }
 		break;
 
-	case IPIPEIF_PAD_SOURCE_VP | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPEIF_PAD_SOURCE_VP | 2 << 16:
 		/* Send to IPIPE/RESIZER */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ipipeif->output & ~IPIPEIF_OUTPUT_VP)

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_resizer.c index b659e465cb56..bc5001002cc5 100644

drivers/staging/media/omap4iss/iss_resizer.c +7 -2

@@ -717,9 +717,14 @@ static int resizer_link_setup(struct media_entity
 *entity, struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
 	struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd);
 	struct iss_device *iss = to_iss_device(resizer);
+	int index = local->index;
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case RESIZER_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	/* FIXME: this is actually a hack! */
+	if (is_media_entity_v4l2_subdev(remote->entity))
+		index |= 2 << 16;
+
+	switch (index) {
+	case RESIZER_PAD_SINK | 2 << 16:
 		/* Read from IPIPE or IPIPEIF. */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			resizer->input = RESIZER_INPUT_NONE;

@@ -737,7 +742,7 @@ static int resizer_link_setup(struct media_entity
 *entity,
 

drivers/staging/media/omap4iss/iss_resizer.c static int resizer_link_setup(struct media_entity *entity, · line 745

Quoted 4 lines

drivers/staging/media/omap4iss/iss_resizer.c +1 -1

 		break;
 
-	case RESIZER_PAD_SOURCE_MEM | MEDIA_ENT_T_DEVNODE:
+	case RESIZER_PAD_SOURCE_MEM :

There's an unneeded space before the :.

Quoted 4 lines

drivers/staging/media/omap4iss/iss_resizer.c +0 -0

 		/* Write to memory */
 		if (flags & MEDIA_LNK_FL_ENABLED) {

if (resizer->output & ~RESIZER_OUTPUT_MEMORY)

This sensor driver is abusing MEDIA_ENT_T_V4L2_SUBDEV, creating some subdevs with a non-existing type.

As this is a sensor driver, the proper type is likely MEDIA_ENT_T_CAM_SENSOR.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index c81bfbfea32f..abae37321c0c 100644

drivers/media/i2c/s5c73m3/s5c73m3-core.c +0 -0

 	ret = media_entity_init(&oif_sd->entity, OIF_NUM_PADS,
 							state->oif_pads);

Hi Mauro,

Thank you for the patch.

Quoted 14 lines · On Sunday 30 August 2015 00:06:45 Mauro Carvalho Chehab wrote:

This sensor driver is abusing MEDIA_ENT_T_V4L2_SUBDEV, creating some subdevs with a non-existing type.

As this is a sensor driver, the proper type is likely MEDIA_ENT_T_CAM_SENSOR.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index c81bfbfea32f..abae37321c0c 100644

drivers/media/i2c/s5c73m3/s5c73m3-core.c static int s5c73m3_probe(struct i2c_client *client, · line 1691

Quoted 5 lines

drivers/media/i2c/s5c73m3/s5c73m3-core.c +1 -1

@@ -1688,7 +1688,7 @@ static int s5c73m3_probe(struct i2c_client *client,
 
 	state->sensor_pads[S5C73M3_JPEG_PAD].flags = MEDIA_PAD_FL_SOURCE;
 	state->sensor_pads[S5C73M3_ISP_PAD].flags = MEDIA_PAD_FL_SOURCE;
-	sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV;
+	sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR;

As explained in my review of "s5k5baf: fix subdev type", this is correct...

drivers/media/i2c/s5c73m3/s5c73m3-core.c static int s5c73m3_probe(struct i2c_client *client, · line 1707

Quoted 8 lines

drivers/media/i2c/s5c73m3/s5c73m3-core.c +1 -1

 	ret = media_entity_init(&sd->entity, S5C73M3_NUM_PADS,
 							state->sensor_pads);

@@ -1704,7 +1704,7 @@ static int s5c73m3_probe(struct i2c_client *client,
 	state->oif_pads[OIF_ISP_PAD].flags = MEDIA_PAD_FL_SINK;
 	state->oif_pads[OIF_JPEG_PAD].flags = MEDIA_PAD_FL_SINK;
 	state->oif_pads[OIF_SOURCE_PAD].flags = MEDIA_PAD_FL_SOURCE;
-	oif_sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV;
+	oif_sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR;

... but this isn't.

Quoted 3 lines

drivers/media/i2c/s5c73m3/s5c73m3-core.c +0 -0

 	ret = media_entity_init(&oif_sd->entity, OIF_NUM_PADS,
 							state->oif_pads);

X-Patchwork-Delegate: [email protected]
This sensor driver is abusing MEDIA_ENT_T_V4L2_SUBDEV, creating some subdevs with a non-existing type.

As this is a sensor driver, the proper type is likely MEDIA_ENT_T_V4L2_SUBDEV_SENSOR.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

drivers/media/i2c/s5k5baf.c +1 -1

index d3bff30bcb6f..0513196bd48c 100644
@@ -1919,7 +1919,7 @@ static int s5k5baf_configure_subdevs(struct s5k5baf
 *state,
 
 	state->pads[PAD_CIS].flags = MEDIA_PAD_FL_SINK;
 	state->pads[PAD_OUT].flags = MEDIA_PAD_FL_SOURCE;
-	sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV;
+	sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR;
 	ret = media_entity_init(&sd->entity, NUM_ISP_PADS, state->pads);
 

if (!ret)

Hi Mauro,

Thank you for the patch.

Quoted 4 lines · On Sunday 30 August 2015 00:06:46 Mauro Carvalho Chehab wrote:

X-Patchwork-Delegate: [email protected]
This sensor driver is abusing MEDIA_ENT_T_V4L2_SUBDEV, creating some subdevs with a non-existing type.

Quoted 2 lines

As this is a sensor driver, the proper type is likely MEDIA_ENT_T_V4L2_SUBDEV_SENSOR.

That's actually not correct. The driver creates two subdevs, one for the image sensor pixel array (and the related readout logic) and one for an ISP. The first subdev already uses the MEDIA_ENT_T_V4L2_SUBDEV_SENSOR type, but the second subdev isn't a sensor pixel array.

From b1acc860aa845e9ea84fa597d540ad34047fe0cc Mon Sep 17 00:00:00 2001

This driver is abusing MEDIA_ENT_T_V4L2_SUBDEV:

- it uses a hack to check if the remote entity is a subdev;

- it still uses the legacy entity subtype check macro, that will be removed soon.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c index b89a057b8b7e..7fd78329e3e1 100644

drivers/staging/media/davinci_vpfe/dm365_ipipe.c +0 -0

@@ -1711,8 +1711,11 @@ ipipe_link_setup(struct media_entity *entity, const

struct media_pad *local, struct vpfe_device *vpfe_dev = to_vpfe_device(ipipe);

drivers/staging/media/davinci_vpfe/dm365_ipipe.c +3 -1

+	switch (local->index) {
+	case IPIPE_PAD_SINK:
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipe->input = IPIPE_INPUT_NONE;
 			break;

@@ -1725,7 +1728,7 @@ ipipe_link_setup(struct media_entity *entity, const
 struct media_pad *local, ipipe->input = IPIPE_INPUT_CCDC;
 		break;
 
-	case IPIPE_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPE_PAD_SOURCE:
 		/* out to RESIZER */
 		if (flags & MEDIA_LNK_FL_ENABLED)
 			ipipe->output = IPIPE_OUTPUT_RESIZER;

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 9eef64e0f0ab..2dbf14b9bb5f 100644

drivers/staging/media/davinci_vpfe/vpfe_video.c +2 -3

@@ -88,7 +88,7 @@ vpfe_video_remote_subdev(struct vpfe_video_device *video,
 u32 *pad) {
 	struct media_pad *remote = media_entity_remote_pad(&video->pad);
 
-	if (remote == NULL || remote->entity->type != MEDIA_ENT_T_V4L2_SUBDEV)
+	if (!remote || !is_media_entity_v4l2_subdev(remote->entity))
 		return NULL;
 	if (pad)
 		*pad = remote->index;

@@ -243,8 +243,7 @@ static int vpfe_video_validate_pipeline(struct
 vpfe_pipeline *pipe)
 
 		/* Retrieve the source format */
 		pad = media_entity_remote_pad(pad);
-		if (pad == NULL ||
-			pad->entity->type != MEDIA_ENT_T_V4L2_SUBDEV)
+		if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
 			break;
 

subdev = media_entity_to_v4l2_subdev(pad->entity);

Hi Mauro,

Thank you for the patch.

Quoted 3 lines · On Sunday 30 August 2015 00:06:47 Mauro Carvalho Chehab wrote:

This driver is abusing MEDIA_ENT_T_V4L2_SUBDEV:

- it uses a hack to check if the remote entity is a subdev;

Same comment as for "omap4iss: stop MEDIA_ENT_T_V4L2_SUBDEV abuse", this isn't a hack.

Quoted 15 lines

- it still uses the legacy entity subtype check macro, that will be removed soon.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c index b89a057b8b7e..7fd78329e3e1 100644

drivers/staging/media/davinci_vpfe/dm365_ipipe.c +0 -0

@@ -1711,8 +1711,11 @@ ipipe_link_setup(struct media_entity *entity, const

struct media_pad *local, struct vpfe_device *vpfe_dev = to_vpfe_device(ipipe);
u16 ipipeif_sink = vpfe_dev->vpfe_ipipeif.input;

drivers/staging/media/davinci_vpfe/dm365_ipipe.c ipipe_link_setup(struct media_entity *entity, const struct media_pad *local, · line 1715

Quoted 4 lines

drivers/staging/media/davinci_vpfe/dm365_ipipe.c +2 -2

-	switch (local->index | media_entity_type(remote->entity)) {
-	case IPIPE_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	if (!is_media_entity_v4l2_subdev(remote->entity))
+		return -EINVAL;

You can drop the check (even though the implementation in the switch looks dubious to me, but that's not your fault).

Quoted 40 lines

drivers/staging/media/davinci_vpfe/dm365_ipipe.c +3 -1

+	switch (local->index) {
+	case IPIPE_PAD_SINK:
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipe->input = IPIPE_INPUT_NONE;
 			break;

@@ -1725,7 +1728,7 @@ ipipe_link_setup(struct media_entity *entity, const
 struct media_pad *local, ipipe->input = IPIPE_INPUT_CCDC;
 		break;
 
-	case IPIPE_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPE_PAD_SOURCE:
 		/* out to RESIZER */
 		if (flags & MEDIA_LNK_FL_ENABLED)
 			ipipe->output = IPIPE_OUTPUT_RESIZER;

(quoted diff) +0 -0

b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 9eef64e0f0ab..2dbf14b9bb5f 100644

drivers/staging/media/davinci_vpfe/vpfe_video.c +2 -3

@@ -88,7 +88,7 @@ vpfe_video_remote_subdev(struct vpfe_video_device *video,
 u32 *pad) {
 	struct media_pad *remote = media_entity_remote_pad(&video->pad);
 
-	if (remote == NULL || remote->entity->type != MEDIA_ENT_T_V4L2_SUBDEV)
+	if (!remote || !is_media_entity_v4l2_subdev(remote->entity))
 		return NULL;
 	if (pad)
 		*pad = remote->index;

@@ -243,8 +243,7 @@ static int vpfe_video_validate_pipeline(struct
 vpfe_pipeline *pipe)
 
 		/* Retrieve the source format */
 		pad = media_entity_remote_pad(pad);
-		if (pad == NULL ||
-			pad->entity->type != MEDIA_ENT_T_V4L2_SUBDEV)
+		if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
 			break;
 

subdev = media_entity_to_v4l2_subdev(pad->entity);

This driver is abusing MEDIA_ENT_T_V4L2_SUBDEV, as it uses a hack to check if the remote entity is a subdev. Get rid of it.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_ipipe.c index e1a7b7ba7362..eb91ec48a21e 100644

drivers/staging/media/omap4iss/iss_ipipe.c +3 -1

+	switch (local->index) {
+	case IPIPE_PAD_SINK:
 		/* Read from IPIPEIF. */
 		if (!(flags & MEDIA_LNK_FL_ENABLED)) {
 			ipipe->input = IPIPE_INPUT_NONE;

@@ -463,7 +466,7 @@ static int ipipe_link_setup(struct media_entity *entity,
 
 		break;
 
-	case IPIPE_PAD_SOURCE_VP | MEDIA_ENT_T_V4L2_SUBDEV:
+	case IPIPE_PAD_SOURCE_VP:
 		/* Send to RESIZER */
 		if (flags & MEDIA_LNK_FL_ENABLED) {
 			if (ipipe->output & ~IPIPE_OUTPUT_VP)

Hi Mauro,

Thank you for the patch.

Quoted 2 lines · On Sunday 30 August 2015 00:06:48 Mauro Carvalho Chehab wrote:

This driver is abusing MEDIA_ENT_T_V4L2_SUBDEV, as it uses a hack to check if the remote entity is a subdev. Get rid of it.

While I agree with the idea of the patch I don't think this is a hack, it was a totally valid implementation with the existing API.

Quoted 8 lines

Signed-off-by Mauro Carvalho Chehab <[email protected]>

(quoted diff) +0 -0

b/drivers/staging/media/omap4iss/iss_ipipe.c index e1a7b7ba7362..eb91ec48a21e 100644

drivers/staging/media/omap4iss/iss_ipipe.c static int ipipe_link_setup(struct media_entity · line 452

Quoted 8 lines

drivers/staging/media/omap4iss/iss_ipipe.c +3 -2

@@ -447,8 +447,11 @@ static int ipipe_link_setup(struct media_entity
 *entity, struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
 	struct iss_device *iss = to_iss_device(ipipe);
 
-	switch (local->index | media_entity_type(remote->entity)) {
-	case IPIPE_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
+	if (!is_media_entity_v4l2_subdev(remote->entity))
+		return -EINVAL;
+

Furthermore the ipipe entity is never connected to anything else than a subdev, so you can remove this check completely.