ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

media: Fix indentation issues introduced by subdev-wide state struct

Browse Source 
Commit 0d346d2a6f ("media: v4l2-subdev: add subdev-wide state struct")
applied a large media tree-wide change produced by coccinelle. It was so
large that a set of identical indentation issues went unnoticed during
review. Fix them.

While at it, and because it's easy to review both changes together, add
a trailing comma for the last (and only) struct member initialization of
the related structures, to avoid future changes should new fields need
to be initialized.

Fixes: 0d346d2a6f ("media: v4l2-subdev: add subdev-wide state struct")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Laurent Pinchart
2023-02-15 17:24:57 +02:00
committed by Hans Verkuil
parent a47a3ae5fc
commit a1e259872f
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/pci/saa7134/saa7134-empress.c
View File

@@ -139,8 +139,8 @@ static int empress_try_fmt_vid_cap(struct file *file, void *priv,
struct saa7134_dev *dev = video_drvdata(file); struct saa7134_dev *dev = video_drvdata(file);
struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_pad_config pad_cfg;
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
struct v4l2_subdev_format format = { struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY, .which = V4L2_SUBDEV_FORMAT_TRY,
}; };

4
drivers/media/platform/atmel/atmel-isi.c
View File

@@ -587,8 +587,8 @@ static int isi_try_fmt(struct atmel_isi *isi, struct v4l2_format *f,
struct v4l2_pix_format *pixfmt = &f->fmt.pix; struct v4l2_pix_format *pixfmt = &f->fmt.pix;
struct v4l2_subdev_pad_config pad_cfg = {}; struct v4l2_subdev_pad_config pad_cfg = {};
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
struct v4l2_subdev_format format = { struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY, .which = V4L2_SUBDEV_FORMAT_TRY,
}; };

4
drivers/media/platform/intel/pxa_camera.c
View File

@@ -1794,8 +1794,8 @@ static int pxac_vidioc_try_fmt_vid_cap(struct file *filp, void *priv,
struct v4l2_pix_format *pix = &f->fmt.pix; struct v4l2_pix_format *pix = &f->fmt.pix;
struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_pad_config pad_cfg;
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
struct v4l2_subdev_format format = { struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY, .which = V4L2_SUBDEV_FORMAT_TRY,
}; };

4
drivers/media/platform/marvell/mcam-core.c
View File

@@ -1351,8 +1351,8 @@ static int mcam_vidioc_try_fmt_vid_cap(struct file *filp, void *priv,
struct v4l2_pix_format *pix = &fmt->fmt.pix; struct v4l2_pix_format *pix = &fmt->fmt.pix;
struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_pad_config pad_cfg;
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
struct v4l2_subdev_format format = { struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY, .which = V4L2_SUBDEV_FORMAT_TRY,
}; };

4
drivers/media/platform/renesas/renesas-ceu.c
View File

@@ -795,8 +795,8 @@ static int __ceu_try_fmt(struct ceu_device *ceudev, struct v4l2_format *v4l2_fmt
struct v4l2_subdev *v4l2_sd = ceu_sd->v4l2_sd; struct v4l2_subdev *v4l2_sd = ceu_sd->v4l2_sd;
struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_pad_config pad_cfg;
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
const struct ceu_fmt *ceu_fmt; const struct ceu_fmt *ceu_fmt;
u32 mbus_code_old; u32 mbus_code_old;
u32 mbus_code; u32 mbus_code;

14
drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
View File

@@ -123,8 +123,8 @@ rkisp1_rsz_get_pad_fmt(struct rkisp1_resizer *rsz,
unsigned int pad, u32 which) unsigned int pad, u32 which)
{ {
struct v4l2_subdev_state state = { struct v4l2_subdev_state state = {
.pads = rsz->pad_cfg .pads = rsz->pad_cfg,
}; };
if (which == V4L2_SUBDEV_FORMAT_TRY) if (which == V4L2_SUBDEV_FORMAT_TRY)
return v4l2_subdev_get_try_format(&rsz->sd, sd_state, pad); return v4l2_subdev_get_try_format(&rsz->sd, sd_state, pad);
else else
@@ -137,8 +137,8 @@ rkisp1_rsz_get_pad_crop(struct rkisp1_resizer *rsz,
unsigned int pad, u32 which) unsigned int pad, u32 which)
{ {
struct v4l2_subdev_state state = { struct v4l2_subdev_state state = {
.pads = rsz->pad_cfg .pads = rsz->pad_cfg,
}; };
if (which == V4L2_SUBDEV_FORMAT_TRY) if (which == V4L2_SUBDEV_FORMAT_TRY)
return v4l2_subdev_get_try_crop(&rsz->sd, sd_state, pad); return v4l2_subdev_get_try_crop(&rsz->sd, sd_state, pad);
else else
@@ -366,7 +366,7 @@ static int rkisp1_rsz_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config dummy_cfg; struct v4l2_subdev_pad_config dummy_cfg;
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &dummy_cfg .pads = &dummy_cfg
}; };
u32 pad = code->pad; u32 pad = code->pad;
int ret; int ret;
@@ -733,8 +733,8 @@ static void rkisp1_rsz_unregister(struct rkisp1_resizer *rsz)
static int rkisp1_rsz_register(struct rkisp1_resizer *rsz) static int rkisp1_rsz_register(struct rkisp1_resizer *rsz)
{ {
struct v4l2_subdev_state state = { struct v4l2_subdev_state state = {
.pads = rsz->pad_cfg .pads = rsz->pad_cfg,
}; };
static const char * const dev_names[] = { static const char * const dev_names[] = {
RKISP1_RSZ_MP_DEV_NAME, RKISP1_RSZ_MP_DEV_NAME,
RKISP1_RSZ_SP_DEV_NAME RKISP1_RSZ_SP_DEV_NAME

4
drivers/media/platform/via/via-camera.c
View File

@@ -845,8 +845,8 @@ static int viacam_do_try_fmt(struct via_camera *cam,
int ret; int ret;
struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_pad_config pad_cfg;
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
struct v4l2_subdev_format format = { struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY, .which = V4L2_SUBDEV_FORMAT_TRY,
}; };

8
drivers/staging/media/atomisp/pci/atomisp_cmd.c
View File

@@ -4254,8 +4254,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
struct atomisp_sub_device *asd = atomisp_to_video_pipe(vdev)->asd; struct atomisp_sub_device *asd = atomisp_to_video_pipe(vdev)->asd;
struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_pad_config pad_cfg;
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
struct v4l2_subdev_format format = { struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY, .which = V4L2_SUBDEV_FORMAT_TRY,
}; };
@@ -4882,8 +4882,8 @@ static int atomisp_set_fmt_to_snr(struct video_device *vdev,
const struct atomisp_format_bridge *format; const struct atomisp_format_bridge *format;
struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_pad_config pad_cfg;
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
struct v4l2_subdev_format vformat = { struct v4l2_subdev_format vformat = {
.which = V4L2_SUBDEV_FORMAT_TRY, .which = V4L2_SUBDEV_FORMAT_TRY,
}; };

4
drivers/staging/media/deprecated/atmel/atmel-isc-base.c
View File

@@ -860,8 +860,8 @@ static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,
struct v4l2_pix_format *pixfmt = &f->fmt.pix; struct v4l2_pix_format *pixfmt = &f->fmt.pix;
struct v4l2_subdev_pad_config pad_cfg = {}; struct v4l2_subdev_pad_config pad_cfg = {};
struct v4l2_subdev_state pad_state = { struct v4l2_subdev_state pad_state = {
.pads = &pad_cfg .pads = &pad_cfg,
}; };
struct v4l2_subdev_format format = { struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY, .which = V4L2_SUBDEV_FORMAT_TRY,
}; };