From: Laurent Pinchart Date: Wed, 15 Oct 2025 07:53:26 +0000 (+0300) Subject: media: meson-g2d: Drop unneeded v4l2_m2m_get_vq() NULL check X-Git-Tag: v6.19-rc1~159^2~220 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7adab6aac0e63eeac1cc82d97ff6a99129be8848;p=thirdparty%2Fkernel%2Flinux.git media: meson-g2d: Drop unneeded v4l2_m2m_get_vq() NULL check The v4l2_m2m_get_vq() function never returns NULL. The check was probably intended to catch invalid format types, but that's not needed as the V4L2 core picks the appropriate VIDIOC_G_FMT ioctl handler based on the format type, so the type can't be incorrect. Drop the unneeded return value check and, as the return value is not used for other purposes and the function has no side effect, the function call as well. Signed-off-by: Laurent Pinchart Reviewed-by: Neil Armstrong Signed-off-by: Hans Verkuil --- diff --git a/drivers/media/platform/amlogic/meson-ge2d/ge2d.c b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c index 5744853a40035..c51c6f4e41dce 100644 --- a/drivers/media/platform/amlogic/meson-ge2d/ge2d.c +++ b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c @@ -632,13 +632,8 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, struct v4l2_format *f static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) { struct ge2d_ctx *ctx = file_to_ge2d_ctx(file); - struct vb2_queue *vq; struct ge2d_frame *frm; - vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); - if (!vq) - return -EINVAL; - frm = get_frame(ctx, f->type); f->fmt.pix = frm->pix_fmt;