On Wed Oct 15 10:53:41 2025 +0300, Laurent Pinchart wrote:
> The v4l2_m2m_get_vq() function never returns NULL.
>
> In the set format handler, the check may have been intended to catch
> invalid format types, but that's not needed as the V4L2 core picks the
> appropriate VIDIOC_S_FMT ioctl handler based on the format type, so the
> type can't be incorrect.
>
> In the get and try format handlers, the return value is not used for any
> purpose other than the NULL check, which was therefore probably intended
> to catch invalid format types. That's not needed for the same reason as
> in the set format handler.
>
> Drop the unneeded return value check and, as the function has no side
> effect, the unneeded function calls as well.
>
> Signed-off-by: Laurent Pinchart <[email protected]>
> Signed-off-by: Hans Verkuil <[email protected]>
Patch committed.
Thanks,
Hans Verkuil
drivers/media/platform/renesas/rcar_jpu.c | 8 --------
1 file changed, 8 deletions(-)
---
diff --git a/drivers/media/platform/renesas/rcar_jpu.c
b/drivers/media/platform/renesas/rcar_jpu.c
index 46ea259a2bb9..3d714fec4fad 100644
--- a/drivers/media/platform/renesas/rcar_jpu.c
+++ b/drivers/media/platform/renesas/rcar_jpu.c
@@ -825,9 +825,6 @@ static int jpu_try_fmt(struct file *file, void *priv,
struct v4l2_format *f)
{
struct jpu_ctx *ctx = file_to_ctx(file);
- if (!v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type))
- return -EINVAL;
-
return __jpu_try_fmt(ctx, NULL, &f->fmt.pix_mp, f->type);
}
@@ -841,8 +838,6 @@ static int jpu_s_fmt(struct file *file, void *priv, struct
v4l2_format *f)
int ret;
vq = v4l2_m2m_get_vq(m2m_ctx, f->type);
- if (!vq)
- return -EINVAL;
if (vb2_is_busy(vq)) {
v4l2_err(&ctx->jpu->v4l2_dev, "%s queue busy\n", __func__);
@@ -866,9 +861,6 @@ static int jpu_g_fmt(struct file *file, void *priv, struct
v4l2_format *f)
struct jpu_ctx *ctx = file_to_ctx(file);
struct jpu_q_data *q_data;
- if (!v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type))
- return -EINVAL;
-
q_data = jpu_get_q_data(ctx, f->type);
f->fmt.pix_mp = q_data->format;
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
