From f2635a9aa0c8214f96c68a86001240c611b5b378 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 15 Feb 2021 05:27:07 +0100 Subject: [PATCH] media: imx: imx7-media-csi: Merge streaming_start() with csi_enable() The imx7_csi_streaming_start() function just wraps imx7_csi_enable(). Call the latter directly. Similarly, merge imx7_csi_streaming_stop() and imx7_csi_disable() as they're both called from a single location only. Signed-off-by: Laurent Pinchart Reviewed-by: Rui Miguel Silva Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/imx/imx7-media-csi.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index f6a26dff8541..53bab0a0a878 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -611,6 +611,8 @@ static void imx7_csi_enable(struct imx7_csi *csi) static void imx7_csi_disable(struct imx7_csi *csi) { + imx7_csi_dma_stop(csi); + imx7_csi_dmareq_rff_disable(csi); imx7_csi_hw_disable_irq(csi); @@ -620,20 +622,6 @@ static void imx7_csi_disable(struct imx7_csi *csi) imx7_csi_hw_disable(csi); } -static void imx7_csi_streaming_start(struct imx7_csi *csi) -{ - imx7_csi_enable(csi); -} - -static int imx7_csi_streaming_stop(struct imx7_csi *csi) -{ - imx7_csi_dma_stop(csi); - - imx7_csi_disable(csi); - - return 0; -} - /* ----------------------------------------------------------------------------- * Interrupt Handling */ @@ -767,9 +755,9 @@ static int imx7_csi_s_stream(struct v4l2_subdev *sd, int enable) goto out_unlock; } - imx7_csi_streaming_start(csi); + imx7_csi_enable(csi); } else { - imx7_csi_streaming_stop(csi); + imx7_csi_disable(csi); v4l2_subdev_call(csi->src_sd, video, s_stream, 0); -- 2.11.0