media: Use designated initializers for all subdev pad ops

Structures passed to subdev pad operations are all zero-initialized when
declaring variables. In most cases, this is done with designated
initializers to initialize some of the fields to specific values, but in
a minority of cases the structures are zero-initialized by assigning
them to '{ 0 }' or '{ }'.

Improve coding style consistency by using designated initializers where
possible, always initializing the 'which' field.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/pci/cobalt/cobalt-v4l2.c b/drivers/media/pci/cobalt/cobalt-v4l2.c
index 284c0909a2827762cb4195338705a561ba2dc23f..4bfbcca14f60b73728ab67df9cf26aa92c4f8c05 100644 (file)
--- a/drivers/media/pci/cobalt/cobalt-v4l2.c
+++ b/drivers/media/pci/cobalt/cobalt-v4l2.c
@@ -910,7 +910,9 @@ static int cobalt_s_fmt_vid_out(struct file *file, void *priv_fh,
 {
        struct cobalt_stream *s = video_drvdata(file);
        struct v4l2_pix_format *pix = &f->fmt.pix;
-       struct v4l2_subdev_format sd_fmt = { 0 };
+       struct v4l2_subdev_format sd_fmt = {
+               .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+       };
        u32 code;
 
        if (cobalt_try_fmt_vid_out(file, priv_fh, f))
@@ -941,7 +943,6 @@ static int cobalt_s_fmt_vid_out(struct file *file, void *priv_fh,
        s->xfer_func = pix->xfer_func;
        s->ycbcr_enc = pix->ycbcr_enc;
        s->quantization = pix->quantization;
-       sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
        v4l2_fill_mbus_format(&sd_fmt.format, pix, code);
        v4l2_subdev_call(s->sd, pad, set_fmt, NULL, &sd_fmt);
        return 0;

diff --git a/drivers/media/platform/microchip/microchip-isc-base.c b/drivers/media/platform/microchip/microchip-isc-base.c
index 71758ee8474bb87922347828b63893d7ddc4ef12..4e657fad33d04e64b7546942d3df7f86d3a100fa 100644 (file)
--- a/drivers/media/platform/microchip/microchip-isc-base.c
+++ b/drivers/media/platform/microchip/microchip-isc-base.c
@@ -858,8 +858,10 @@ static int isc_try_configure_pipeline(struct isc_device *isc)
 static void isc_try_fse(struct isc_device *isc,
                        struct v4l2_subdev_state *sd_state)
 {
+       struct v4l2_subdev_frame_size_enum fse = {
+               .which = V4L2_SUBDEV_FORMAT_TRY,
+       };
        int ret;
-       struct v4l2_subdev_frame_size_enum fse = {};
 
        /*
         * If we do not know yet which format the subdev is using, we cannot
@@ -869,7 +871,6 @@ static void isc_try_fse(struct isc_device *isc,
                return;
 
        fse.code = isc->try_config.sd_format->mbus_code;
-       fse.which = V4L2_SUBDEV_FORMAT_TRY;
 
        ret = v4l2_subdev_call(isc->current_subdev->sd, pad, enum_frame_size,
                               sd_state, &fse);

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drm.c b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
index db8ee8f1d889d9f55d93c27b26e1ce178f17ef66..9b087bd8df7d8c6ee4b341c0a99b3d7daaf194ef 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
@@ -481,10 +481,11 @@ static int vsp1_du_pipeline_setup_output(struct vsp1_device *vsp1,
                                         struct vsp1_pipeline *pipe)
 {
        struct vsp1_drm_pipeline *drm_pipe = to_vsp1_drm_pipeline(pipe);
-       struct v4l2_subdev_format format = { 0, };
+       struct v4l2_subdev_format format = {
+               .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+       };
        int ret;
 
-       format.which = V4L2_SUBDEV_FORMAT_ACTIVE;
        format.pad = RWPF_PAD_SINK;
        format.format.width = drm_pipe->width;
        format.format.height = drm_pipe->height;

diff --git a/drivers/staging/media/deprecated/atmel/atmel-isc-base.c b/drivers/staging/media/deprecated/atmel/atmel-isc-base.c
index 0d48ae1bd71a313b62328c3d99f76a44c5569ee8..61c5afa581424299070a0d945808e5830d613dd3 100644 (file)
--- a/drivers/staging/media/deprecated/atmel/atmel-isc-base.c
+++ b/drivers/staging/media/deprecated/atmel/atmel-isc-base.c
@@ -824,8 +824,10 @@ static int isc_try_configure_pipeline(struct isc_device *isc)
 static void isc_try_fse(struct isc_device *isc,
                        struct v4l2_subdev_state *sd_state)
 {
+       struct v4l2_subdev_frame_size_enum fse = {
+               .which = V4L2_SUBDEV_FORMAT_TRY,
+       };
        int ret;
-       struct v4l2_subdev_frame_size_enum fse = {};
 
        /*
         * If we do not know yet which format the subdev is using, we cannot
@@ -835,7 +837,6 @@ static void isc_try_fse(struct isc_device *isc,
                return;
 
        fse.code = isc->try_config.sd_format->mbus_code;
-       fse.which = V4L2_SUBDEV_FORMAT_TRY;
 
        ret = v4l2_subdev_call(isc->current_subdev->sd, pad, enum_frame_size,
                               sd_state, &fse);