hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: rcar-vin: Fold rvin_initialize_device() into rvin_open() 

The function no longer serve a purpose as most tasks it performed have
been refactored, fold what remains of it into the only caller. While at
it add error checking for v4l2_ctrl_handler_setup().

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Niklas Söderlund 2019-06-12 19:45:46 -04:00 committed by Mauro Carvalho Chehab
parent e378faaa66
commit a59846ce4f
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/platform/rcar-vin/rcar-v4l2.c
View File

@ -762,20 +762,6 @@ static int rvin_power_parallel(struct rvin_dev *vin, bool on)
return 0;
}
static int rvin_initialize_device(struct file *file)
{
struct rvin_dev *vin = video_drvdata(file);
int ret;
ret = rvin_power_parallel(vin, true);
if (ret < 0)
return ret;
v4l2_ctrl_handler_setup(&vin->ctrl_handler);
return 0;
}
static int rvin_open(struct file *file)
{
struct rvin_dev *vin = video_drvdata(file);
@ -796,14 +782,20 @@ static int rvin_open(struct file *file)
goto err_unlock;
if (v4l2_fh_is_singular_file(file)) {
ret = rvin_initialize_device(file);
if (ret)
ret = rvin_power_parallel(vin, true);
if (ret < 0)
goto err_open;
ret = v4l2_ctrl_handler_setup(&vin->ctrl_handler);
if (ret)
goto err_parallel;
}
mutex_unlock(&vin->lock);
return 0;
err_parallel:
rvin_power_parallel(vin, false);
err_open:
v4l2_fh_release(file);
err_unlock: