| Message ID | 20190516011417.10590-8-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | rcar-vin: Merge Gen2 and Gen3 file operations | expand |
Hi Niklas, Thank you for the patch. On Thu, May 16, 2019 at 03:14:16AM +0200, Niklas Söderlund wrote: > The function no longer serve a purpose as most tasks it performed have > been refactored, fold what remains of it into the only caller. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> > --- > drivers/media/platform/rcar-vin/rcar-v4l2.c | 21 ++++----------------- > 1 file changed, 4 insertions(+), 17 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c > index 7c8ba4b310706ceb..169639416121f204 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -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,10 +782,11 @@ static int rvin_open(struct file *file) > goto err_pm; > > if (v4l2_fh_is_singular_file(file)) { > - if (rvin_initialize_device(file)) { > - ret = -ENODEV; > + ret = rvin_power_parallel(vin, true); > + if (ret < 0) > goto err_open; > - } > + > + v4l2_ctrl_handler_setup(&vin->ctrl_handler); I think you should handle errors here. > } > > mutex_unlock(&vin->lock);
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 7c8ba4b310706ceb..169639416121f204 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -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,10 +782,11 @@ static int rvin_open(struct file *file) goto err_pm; if (v4l2_fh_is_singular_file(file)) { - if (rvin_initialize_device(file)) { - ret = -ENODEV; + ret = rvin_power_parallel(vin, true); + if (ret < 0) goto err_open; - } + + v4l2_ctrl_handler_setup(&vin->ctrl_handler); } mutex_unlock(&vin->lock);