[media.git/next] media: renesas: vsp1: wpf: Propagate vsp1_rwpf_init_ctrls()

[media-ci]

On Tue Apr 1 16:22:03 2025 +0200, Jacopo Mondi wrote:
> vsp1_wpf.c calls vsp1_rwpf_init_ctrls() to initialize controls that
> are common between RPF and WPF.
> 
> However, the vsp1_wpf.c implementation does not check for the function
> call return value. Fix this by propagating to the caller the return
> value.
> 
> While at it, drop a duplicated error message in wpf_init_controls() as
> the caller already report it.
> 
> Signed-off-by: Jacopo Mondi <jacopo.mondi+rene...@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> Reviewed-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
> Link: 
> https://lore.kernel.org/r/20250401-v4h-iif-v7-3-cc547c0bd...@ideasonboard.com
> Signed-off-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>

Patch committed.

Thanks,
Hans Verkuil

 drivers/media/platform/renesas/vsp1/vsp1_wpf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

---

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_wpf.c 
b/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
index f176750ccd98..da651a882bbb 100644
--- a/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
@@ -133,6 +133,7 @@ static int wpf_init_controls(struct vsp1_rwpf *wpf)
 {
        struct vsp1_device *vsp1 = wpf->entity.vsp1;
        unsigned int num_flip_ctrls;
+       int ret;
 
        spin_lock_init(&wpf->flip.lock);
 
@@ -156,7 +157,9 @@ static int wpf_init_controls(struct vsp1_rwpf *wpf)
                num_flip_ctrls = 0;
        }
 
-       vsp1_rwpf_init_ctrls(wpf, num_flip_ctrls);
+       ret = vsp1_rwpf_init_ctrls(wpf, num_flip_ctrls);
+       if (ret < 0)
+               return ret;
 
        if (num_flip_ctrls >= 1) {
                wpf->flip.ctrls.vflip =
@@ -174,11 +177,8 @@ static int wpf_init_controls(struct vsp1_rwpf *wpf)
                v4l2_ctrl_cluster(3, &wpf->flip.ctrls.vflip);
        }
 
-       if (wpf->ctrls.error) {
-               dev_err(vsp1->dev, "wpf%u: failed to initialize controls\n",
-                       wpf->entity.index);
+       if (wpf->ctrls.error)
                return wpf->ctrls.error;
-       }
 
        return 0;
 }