Commit e18a7e9a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Hans Verkuil

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent e3a69496
...@@ -910,7 +910,9 @@ static int cobalt_s_fmt_vid_out(struct file *file, void *priv_fh, ...@@ -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 cobalt_stream *s = video_drvdata(file);
struct v4l2_pix_format *pix = &f->fmt.pix; 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; u32 code;
if (cobalt_try_fmt_vid_out(file, priv_fh, f)) 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, ...@@ -941,7 +943,6 @@ static int cobalt_s_fmt_vid_out(struct file *file, void *priv_fh,
s->xfer_func = pix->xfer_func; s->xfer_func = pix->xfer_func;
s->ycbcr_enc = pix->ycbcr_enc; s->ycbcr_enc = pix->ycbcr_enc;
s->quantization = pix->quantization; s->quantization = pix->quantization;
sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
v4l2_fill_mbus_format(&sd_fmt.format, pix, code); v4l2_fill_mbus_format(&sd_fmt.format, pix, code);
v4l2_subdev_call(s->sd, pad, set_fmt, NULL, &sd_fmt); v4l2_subdev_call(s->sd, pad, set_fmt, NULL, &sd_fmt);
return 0; return 0;
......
...@@ -858,8 +858,10 @@ static int isc_try_configure_pipeline(struct isc_device *isc) ...@@ -858,8 +858,10 @@ static int isc_try_configure_pipeline(struct isc_device *isc)
static void isc_try_fse(struct isc_device *isc, static void isc_try_fse(struct isc_device *isc,
struct v4l2_subdev_state *sd_state) struct v4l2_subdev_state *sd_state)
{ {
struct v4l2_subdev_frame_size_enum fse = {
.which = V4L2_SUBDEV_FORMAT_TRY,
};
int ret; int ret;
struct v4l2_subdev_frame_size_enum fse = {};
/* /*
* If we do not know yet which format the subdev is using, we cannot * 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, ...@@ -869,7 +871,6 @@ static void isc_try_fse(struct isc_device *isc,
return; return;
fse.code = isc->try_config.sd_format->mbus_code; 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, ret = v4l2_subdev_call(isc->current_subdev->sd, pad, enum_frame_size,
sd_state, &fse); sd_state, &fse);
......
...@@ -481,10 +481,11 @@ static int vsp1_du_pipeline_setup_output(struct vsp1_device *vsp1, ...@@ -481,10 +481,11 @@ static int vsp1_du_pipeline_setup_output(struct vsp1_device *vsp1,
struct vsp1_pipeline *pipe) struct vsp1_pipeline *pipe)
{ {
struct vsp1_drm_pipeline *drm_pipe = to_vsp1_drm_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; int ret;
format.which = V4L2_SUBDEV_FORMAT_ACTIVE;
format.pad = RWPF_PAD_SINK; format.pad = RWPF_PAD_SINK;
format.format.width = drm_pipe->width; format.format.width = drm_pipe->width;
format.format.height = drm_pipe->height; format.format.height = drm_pipe->height;
......
...@@ -824,8 +824,10 @@ static int isc_try_configure_pipeline(struct isc_device *isc) ...@@ -824,8 +824,10 @@ static int isc_try_configure_pipeline(struct isc_device *isc)
static void isc_try_fse(struct isc_device *isc, static void isc_try_fse(struct isc_device *isc,
struct v4l2_subdev_state *sd_state) struct v4l2_subdev_state *sd_state)
{ {
struct v4l2_subdev_frame_size_enum fse = {
.which = V4L2_SUBDEV_FORMAT_TRY,
};
int ret; int ret;
struct v4l2_subdev_frame_size_enum fse = {};
/* /*
* If we do not know yet which format the subdev is using, we cannot * 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, ...@@ -835,7 +837,6 @@ static void isc_try_fse(struct isc_device *isc,
return; return;
fse.code = isc->try_config.sd_format->mbus_code; 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, ret = v4l2_subdev_call(isc->current_subdev->sd, pad, enum_frame_size,
sd_state, &fse); sd_state, &fse);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment