Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 23:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: imx: imx7-media-csi: Merge streaming_start() with csi_enable()

Browse Source 
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Laurent Pinchart 2021-02-15 05:27:07 +01:00 committed by Mauro Carvalho Chehab
parent ff43ca9119
commit f2635a9aa0
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/media/imx/imx7-media-csi.c
View File

@ -611,6 +611,8 @@ static void imx7_csi_enable(struct imx7_csi *csi)
static void imx7_csi_disable(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_dmareq_rff_disable(csi);
imx7_csi_hw_disable_irq(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); 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 * Interrupt Handling
*/ */
@ -767,9 +755,9 @@ static int imx7_csi_s_stream(struct v4l2_subdev *sd, int enable)
goto out_unlock; goto out_unlock;
} }
imx7_csi_streaming_start(csi); imx7_csi_enable(csi);
} else { } else {
imx7_csi_streaming_stop(csi); imx7_csi_disable(csi);
v4l2_subdev_call(csi->src_sd, video, s_stream, 0); v4l2_subdev_call(csi->src_sd, video, s_stream, 0);