media: mtk-vcodec: Do not zero reserved fields

Core code already clears reserved fields of struct
v4l2_pix_format_mplane, check commit 4e1e0eb0e074 ("media: v4l2-ioctl: Zero
v4l2_plane_pix_format reserved fields").

[hverkuil: drop unused variable i]

Cc: Matthias Brugger <matthias.bgg@gmail.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
index c768a587a94439e399a8541db18f336e64cb1c2d..56d86e59421e078f0a6715feb4ccbf64c7de10d1 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
@@ -657,7 +657,6 @@ static int vidioc_try_fmt(struct v4l2_format *f,
                          const struct mtk_video_fmt *fmt)
 {
        struct v4l2_pix_format_mplane *pix_fmt_mp = &f->fmt.pix_mp;
-       int i;
 
        pix_fmt_mp->field = V4L2_FIELD_NONE;
 
@@ -715,12 +714,7 @@ static int vidioc_try_fmt(struct v4l2_format *f,
                }
        }
 
-       for (i = 0; i < pix_fmt_mp->num_planes; i++)
-               memset(&(pix_fmt_mp->plane_fmt[i].reserved[0]), 0x0,
-                          sizeof(pix_fmt_mp->plane_fmt[0].reserved));
-
        pix_fmt_mp->flags = 0;
-       memset(&pix_fmt_mp->reserved, 0x0, sizeof(pix_fmt_mp->reserved));
        return 0;
 }
 

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 21de1431cfcb5091d82ab7be9f55ed50c6388ed8..8c917969c2f1357beb4bf59a8947853a0bd89c9a 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -121,7 +121,6 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f,
                return -EINVAL;
 
        f->pixelformat = formats[f->index].fourcc;
-       memset(f->reserved, 0, sizeof(f->reserved));
 
        return 0;
 }
@@ -252,7 +251,6 @@ static int vidioc_try_fmt(struct v4l2_format *f,
                          const struct mtk_video_fmt *fmt)
 {
        struct v4l2_pix_format_mplane *pix_fmt_mp = &f->fmt.pix_mp;
-       int i;
 
        pix_fmt_mp->field = V4L2_FIELD_NONE;
 
@@ -320,13 +318,7 @@ static int vidioc_try_fmt(struct v4l2_format *f,
                }
        }
 
-       for (i = 0; i < pix_fmt_mp->num_planes; i++)
-               memset(&(pix_fmt_mp->plane_fmt[i].reserved[0]), 0x0,
-                          sizeof(pix_fmt_mp->plane_fmt[0].reserved));
-
        pix_fmt_mp->flags = 0;
-       memset(&pix_fmt_mp->reserved, 0x0,
-               sizeof(pix_fmt_mp->reserved));
 
        return 0;
 }
@@ -532,8 +524,6 @@ static int vidioc_venc_g_fmt(struct file *file, void *priv,
        for (i = 0; i < pix->num_planes; i++) {
                pix->plane_fmt[i].bytesperline = q_data->bytesperline[i];
                pix->plane_fmt[i].sizeimage = q_data->sizeimage[i];
-               memset(&(pix->plane_fmt[i].reserved[0]), 0x0,
-                      sizeof(pix->plane_fmt[i].reserved));
        }
 
        pix->flags = 0;