GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-06 14:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

media: staging: rkisp1: change function to return void instead of int

Browse source 
There are functions that return int but actually return always 0.
Change them to return void and then there is no need to check
for error return value.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.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:
Dafna Hirschfeld 2020-02-07 09:59:48 +01:00 • committed by Mauro Carvalho Chehab
parent 100f720aab
commit 0966f4e5a8
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/media/rkisp1/rkisp1-isp.c
View file

@ -504,7 +504,7 @@ static int rkisp1_config_cif(struct rkisp1_device *rkisp1)
return 0;
}
static int rkisp1_isp_stop(struct rkisp1_device *rkisp1)
static void rkisp1_isp_stop(struct rkisp1_device *rkisp1)
{
u32 val;
@ -540,8 +540,6 @@ static int rkisp1_isp_stop(struct rkisp1_device *rkisp1)
RKISP1_CIF_IRCL_MIPI_SW_RST | RKISP1_CIF_IRCL_ISP_SW_RST,
RKISP1_CIF_IRCL);
rkisp1_write(rkisp1, 0x0, RKISP1_CIF_IRCL);
return 0;
}
static void rkisp1_config_clk(struct rkisp1_device *rkisp1)
@ -555,7 +553,7 @@ static void rkisp1_config_clk(struct rkisp1_device *rkisp1)
rkisp1_write(rkisp1, val, RKISP1_CIF_ICCL);
}
static int rkisp1_isp_start(struct rkisp1_device *rkisp1)
static void rkisp1_isp_start(struct rkisp1_device *rkisp1)
{
struct rkisp1_sensor_async *sensor = rkisp1->active_sensor;
u32 val;
@ -580,8 +578,6 @@ static int rkisp1_isp_start(struct rkisp1_device *rkisp1)
* the MIPI interface and before starting the sensor output.
*/
usleep_range(1000, 1200);
return 0;
}
/* ----------------------------------------------------------------------------
@ -940,9 +936,7 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable)
int ret = 0;
if (!enable) {
ret = rkisp1_isp_stop(rkisp1);
if (ret)
return ret;
rkisp1_isp_stop(rkisp1);
rkisp1_mipi_csi2_stop(rkisp1->active_sensor);
return 0;
}
@ -965,9 +959,7 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable)
if (ret)
return ret;
ret = rkisp1_isp_start(rkisp1);
if (ret)
rkisp1_mipi_csi2_stop(rkisp1->active_sensor);
rkisp1_isp_start(rkisp1);
return ret;
}