diff mbox series

[v13,11/34] media: drivers: use video_device_pipeline()

Message ID 20220810121122.3149086-12-tomi.valkeinen@ideasonboard.com (mailing list archive)
State Accepted
Headers
Series v4l: routing and streams support |

Commit Message

Tomi Valkeinen Aug. 10, 2022, 12:10 p.m. UTC 
  Use video_device_pipeline() in the drivers instead of
media_entity_pipeline().

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/media/platform/xilinx/xilinx-dma.c | 4 ++--
 drivers/media/platform/xilinx/xilinx-dma.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Laurent Pinchart Aug. 29, 2022, 4:48 p.m. UTC | #1 
Hi Tomi,

Thank you for the patch.

On Wed, Aug 10, 2022 at 03:10:59PM +0300, Tomi Valkeinen wrote:
> 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@ideasonboard.com>

> ---
>  drivers/media/platform/xilinx/xilinx-dma.c | 4 ++--
>  drivers/media/platform/xilinx/xilinx-dma.h | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
> index fcec691ce7fc..040d6e7cceeb 100644
> --- 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 @@ static int xvip_dma_start_streaming(struct vb2_queue *vq, unsigned int count)
>  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 3ea10f6b0bb9..9c6d4c18d1a9 100644
> --- 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;
diff mbox series

Patch

diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index fcec691ce7fc..040d6e7cceeb 100644
--- 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 @@  static int xvip_dma_start_streaming(struct vb2_queue *vq, unsigned int count)
 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 3ea10f6b0bb9..9c6d4c18d1a9 100644
--- 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;