media: pci: Fill v4l2_fmtdesc with designated initializers

Replace initialization of static const v4l2_fmtdesc instances that
specify every struct member with designated initializers. This allows
not zeroing the reserved fields explicitly, and will avoid a need to
patch these drivers every time a reserved field is repurposed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index fa57e12..4864def 100644 (file)
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -466,14 +466,24 @@ static int cx18_enum_fmt_vid_cap(struct file *file, void *fh,
                                        struct v4l2_fmtdesc *fmt)
 {
        static const struct v4l2_fmtdesc formats[] = {
-               { 0, V4L2_BUF_TYPE_VIDEO_CAPTURE, 0,
-                 "HM12 (YUV 4:1:1)", V4L2_PIX_FMT_HM12, { 0, 0, 0, 0 }
+               {
+                       .index = 0,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .description = "HM12 (YUV 4:1:1)",
+                       .pixelformat = V4L2_PIX_FMT_HM12,
                },
-               { 1, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FMT_FLAG_COMPRESSED,
-                 "MPEG", V4L2_PIX_FMT_MPEG, { 0, 0, 0, 0 }
+               {
+                       .index = 1,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .flags = V4L2_FMT_FLAG_COMPRESSED,
+                       .description = "MPEG",
+                       .pixelformat = V4L2_PIX_FMT_MPEG,
                },
-               { 2, V4L2_BUF_TYPE_VIDEO_CAPTURE, 0,
-                 "UYVY 4:2:2", V4L2_PIX_FMT_UYVY, { 0, 0, 0, 0 }
+               {
+                       .index = 2,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .description = "UYVY 4:2:2",
+                       .pixelformat = V4L2_PIX_FMT_UYVY,
                },
        };
 

diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 1378539..35dccb3 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -920,14 +920,15 @@ static int ivtv_g_selection(struct file *file, void *fh,
 static int ivtv_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdesc *fmt)
 {
        static const struct v4l2_fmtdesc hm12 = {
-               0, V4L2_BUF_TYPE_VIDEO_CAPTURE, 0,
-               "HM12 (YUV 4:2:0)", V4L2_PIX_FMT_HM12,
-               { 0, 0, 0, 0 }
+               .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+               .description = "HM12 (YUV 4:2:0)",
+               .pixelformat = V4L2_PIX_FMT_HM12,
        };
        static const struct v4l2_fmtdesc mpeg = {
-               0, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FMT_FLAG_COMPRESSED,
-               "MPEG", V4L2_PIX_FMT_MPEG,
-               { 0, 0, 0, 0 }
+               .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+               .flags = V4L2_FMT_FLAG_COMPRESSED,
+               .description = "MPEG",
+               .pixelformat = V4L2_PIX_FMT_MPEG,
        };
        struct ivtv *itv = fh2id(fh)->itv;
        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
@@ -946,14 +947,15 @@ static int ivtv_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdes
 static int ivtv_enum_fmt_vid_out(struct file *file, void *fh, struct v4l2_fmtdesc *fmt)
 {
        static const struct v4l2_fmtdesc hm12 = {
-               0, V4L2_BUF_TYPE_VIDEO_OUTPUT, 0,
-               "HM12 (YUV 4:2:0)", V4L2_PIX_FMT_HM12,
-               { 0, 0, 0, 0 }
+               .type = V4L2_BUF_TYPE_VIDEO_OUTPUT,
+               .description = "HM12 (YUV 4:2:0)",
+               .pixelformat = V4L2_PIX_FMT_HM12,
        };
        static const struct v4l2_fmtdesc mpeg = {
-               0, V4L2_BUF_TYPE_VIDEO_OUTPUT, V4L2_FMT_FLAG_COMPRESSED,
-               "MPEG", V4L2_PIX_FMT_MPEG,
-               { 0, 0, 0, 0 }
+               .type = V4L2_BUF_TYPE_VIDEO_OUTPUT,
+               .flags = V4L2_FMT_FLAG_COMPRESSED,
+               .description = "MPEG",
+               .pixelformat = V4L2_PIX_FMT_MPEG,
        };
        struct ivtv *itv = fh2id(fh)->itv;
        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];