media: ti: omap3isp: Use media_pipeline_for_each_entity()

Replace usage of the deprecated media graph walk API with the new
media_pipeline_for_each_entity() macro.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/ti/omap3isp/ispvideo.c b/drivers/media/platform/ti/omap3isp/ispvideo.c
index 3e5348c..ddc7d08 100644 (file)
--- a/drivers/media/platform/ti/omap3isp/ispvideo.c
+++ b/drivers/media/platform/ti/omap3isp/ispvideo.c
@@ -221,22 +221,16 @@ isp_video_remote_subdev(struct isp_video *video, u32 *pad)
 static int isp_video_get_graph_data(struct isp_video *video,
                                    struct isp_pipeline *pipe)
 {
-       struct media_graph graph;
-       struct media_entity *entity = &video->video.entity;
-       struct media_device *mdev = entity->graph_obj.mdev;
+       struct media_pipeline_entity_iter iter;
+       struct media_entity *entity;
        struct isp_video *far_end = NULL;
        int ret;
 
-       mutex_lock(&mdev->graph_mutex);
-       ret = media_graph_walk_init(&graph, mdev);
-       if (ret) {
-               mutex_unlock(&mdev->graph_mutex);
+       ret = media_pipeline_entity_iter_init(&pipe->pipe, &iter);
+       if (ret)
                return ret;
-       }
 
-       media_graph_walk_start(&graph, entity);
-
-       while ((entity = media_graph_walk_next(&graph))) {
+       media_pipeline_for_each_entity(&pipe->pipe, &iter, entity) {
                struct isp_video *__video;
 
                media_entity_enum_set(&pipe->ent_enum, entity);
@@ -255,9 +249,7 @@ static int isp_video_get_graph_data(struct isp_video *video,
                        far_end = __video;
        }
 
-       mutex_unlock(&mdev->graph_mutex);
-
-       media_graph_walk_cleanup(&graph);
+       media_pipeline_entity_iter_cleanup(&iter);
 
        if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
                pipe->input = far_end;