media: amphion: Drop unneeded v4l2_m2m_get_vq() NULL check

The v4l2_m2m_get_vq() function never returns NULL. 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. Drop the unneeded
return value check.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
index 32eef2fd1f2a90243256709d2a6a1f7d62a6816a..79790fbadc95783752a2c3ab8c13b6817ffad6fd 100644 (file)
--- a/drivers/media/platform/amphion/vdec.c
+++ b/drivers/media/platform/amphion/vdec.c
@@ -532,8 +532,6 @@ static int vdec_s_fmt_common(struct vpu_inst *inst, struct v4l2_format *f)
                return -EINVAL;
 
        q = v4l2_m2m_get_vq(inst->fh.m2m_ctx, f->type);
-       if (!q)
-               return -EINVAL;
        if (vb2_is_busy(q))
                return -EBUSY;
 

diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform/amphion/venc.c
index c5c1f1fbaa80366d5b18b8f24699eb9c3a18ef92..319fbae7057120132bc4dd0095c3d74aa9cb2995 100644 (file)
--- a/drivers/media/platform/amphion/venc.c
+++ b/drivers/media/platform/amphion/venc.c
@@ -223,8 +223,6 @@ static int venc_s_fmt(struct file *file, void *fh, struct v4l2_format *f)
        struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
 
        q = v4l2_m2m_get_vq(inst->fh.m2m_ctx, f->type);
-       if (!q)
-               return -EINVAL;
        if (vb2_is_busy(q))
                return -EBUSY;