media: drivers: use video_device_pipeline()

Use video_device_pipeline() in the drivers instead of
media_entity_pipeline().

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@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/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 9a17733..0a7fd86 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -402,7 +402,7 @@ static int xvip_dma_start_streaming(struct vb2_queue *vq, unsigned int count)
         * Use the pipeline object embedded in the first DMA object that starts
         * streaming.
         */
-       pipe = to_xvip_pipeline(&dma->video.entity) ? : &dma->pipe;
+       pipe = to_xvip_pipeline(&dma->video) ? : &dma->pipe;
 
        ret = video_device_pipeline_start(&dma->video, &pipe->pipe);
        if (ret < 0)
@@ -447,7 +447,7 @@ error:
 static void xvip_dma_stop_streaming(struct vb2_queue *vq)
 {
        struct xvip_dma *dma = vb2_get_drv_priv(vq);
-       struct xvip_pipeline *pipe = to_xvip_pipeline(&dma->video.entity);
+       struct xvip_pipeline *pipe = to_xvip_pipeline(&dma->video);
        struct xvip_dma_buffer *buf, *nbuf;
 
        /* Stop the pipeline. */

diff --git a/drivers/media/platform/xilinx/xilinx-dma.h b/drivers/media/platform/xilinx/xilinx-dma.h
index 3ea10f6..9c6d4c1 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-dma.h
+++ b/drivers/media/platform/xilinx/xilinx-dma.h
@@ -45,9 +45,9 @@ struct xvip_pipeline {
        struct xvip_dma *output;
 };
 
-static inline struct xvip_pipeline *to_xvip_pipeline(struct media_entity *e)
+static inline struct xvip_pipeline *to_xvip_pipeline(struct video_device *vdev)
 {
-       struct media_pipeline *pipe = media_entity_pipeline(e);
+       struct media_pipeline *pipe = video_device_pipeline(vdev);
 
        if (!pipe)
                return NULL;