media: samsung: s5p-jpeg: Drop unneeded v4l2_m2m_get_vq() NULL check

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 format handler, 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 call as well.

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

diff --git a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
index 81792f7f8b1671dba2023f99b2779784d9a14b8c..ff28482759ec7d64a7785b6049bbe7f3a0d54e14 100644 (file)
--- a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
@@ -1332,15 +1332,10 @@ static struct s5p_jpeg_q_data *get_q_data(struct s5p_jpeg_ctx *ctx,
 
 static int s5p_jpeg_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
-       struct vb2_queue *vq;
        struct s5p_jpeg_q_data *q_data = NULL;
        struct v4l2_pix_format *pix = &f->fmt.pix;
        struct s5p_jpeg_ctx *ct = file_to_ctx(file);
 
-       vq = v4l2_m2m_get_vq(ct->fh.m2m_ctx, f->type);
-       if (!vq)
-               return -EINVAL;
-
        if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE &&
            ct->mode == S5P_JPEG_DECODE && !ct->hdr_parsed)
                return -EINVAL;
@@ -1593,8 +1588,6 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)
        unsigned int f_type;
 
        vq = v4l2_m2m_get_vq(ct->fh.m2m_ctx, f->type);
-       if (!vq)
-               return -EINVAL;
 
        q_data = get_q_data(ct, f->type);
        BUG_ON(q_data == NULL);