From b9e50a06eb1303445f38dc4a7e83b6093082200e Mon Sep 17 00:00:00 2001 From: Amarjargal Gundjalam Date: Mon, 26 Oct 2015 06:09:31 -0700 Subject: [PATCH] staging: media: omap4iss: Matches alignment with open parenthesis This patch fixes some of the checkpatch issue: CHECK: Alignment should match open parenthesis Signed-off-by: Amarjargal Gundjalam Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/omap4iss/iss.c | 8 +++---- drivers/staging/media/omap4iss/iss_ipipe.c | 22 ++++++++++---------- drivers/staging/media/omap4iss/iss_ipipe.h | 2 +- drivers/staging/media/omap4iss/iss_ipipeif.c | 16 +++++++------- drivers/staging/media/omap4iss/iss_ipipeif.h | 4 ++-- drivers/staging/media/omap4iss/iss_resizer.c | 16 +++++++------- drivers/staging/media/omap4iss/iss_resizer.h | 4 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c index 104fc582b736..c1430017237d 100644 --- a/drivers/staging/media/omap4iss/iss.c +++ b/drivers/staging/media/omap4iss/iss.c @@ -541,7 +541,7 @@ static int iss_pipeline_link_notify(struct media_link *link, u32 flags, } if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH && - (flags & MEDIA_LNK_FL_ENABLED)) { + (flags & MEDIA_LNK_FL_ENABLED)) { ret = iss_pipeline_pm_power(source, sink_use); if (ret < 0) return ret; @@ -919,7 +919,7 @@ static int __iss_subclk_update(struct iss_device *iss) } int omap4iss_subclk_enable(struct iss_device *iss, - enum iss_subclk_resource res) + enum iss_subclk_resource res) { iss->subclk_resources |= res; @@ -927,7 +927,7 @@ int omap4iss_subclk_enable(struct iss_device *iss, } int omap4iss_subclk_disable(struct iss_device *iss, - enum iss_subclk_resource res) + enum iss_subclk_resource res) { iss->subclk_resources &= ~res; @@ -1137,7 +1137,7 @@ static void iss_unregister_entities(struct iss_device *iss) */ static struct v4l2_subdev * iss_register_subdev_group(struct iss_device *iss, - struct iss_subdev_i2c_board_info *board_info) + struct iss_subdev_i2c_board_info *board_info) { struct v4l2_subdev *sensor = NULL; unsigned int first; diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c index fcde8a65cc2a..dd0abeffd893 100644 --- a/drivers/staging/media/omap4iss/iss_ipipe.c +++ b/drivers/staging/media/omap4iss/iss_ipipe.c @@ -247,8 +247,8 @@ ipipe_try_format(struct iss_ipipe_device *ipipe, * return -EINVAL or zero on success */ static int ipipe_enum_mbus_code(struct v4l2_subdev *sd, - struct v4l2_subdev_pad_config *cfg, - struct v4l2_subdev_mbus_code_enum *code) + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_mbus_code_enum *code) { switch (code->pad) { case IPIPE_PAD_SINK: @@ -274,8 +274,8 @@ static int ipipe_enum_mbus_code(struct v4l2_subdev *sd, } static int ipipe_enum_frame_size(struct v4l2_subdev *sd, - struct v4l2_subdev_pad_config *cfg, - struct v4l2_subdev_frame_size_enum *fse) + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_frame_size_enum *fse) { struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct v4l2_mbus_framefmt format; @@ -353,18 +353,18 @@ static int ipipe_set_format(struct v4l2_subdev *sd, /* Propagate the format from sink to source */ if (fmt->pad == IPIPE_PAD_SINK) { format = __ipipe_get_format(ipipe, cfg, IPIPE_PAD_SOURCE_VP, - fmt->which); + fmt->which); *format = fmt->format; ipipe_try_format(ipipe, cfg, IPIPE_PAD_SOURCE_VP, format, - fmt->which); + fmt->which); } return 0; } static int ipipe_link_validate(struct v4l2_subdev *sd, struct media_link *link, - struct v4l2_subdev_format *source_fmt, - struct v4l2_subdev_format *sink_fmt) + struct v4l2_subdev_format *source_fmt, + struct v4l2_subdev_format *sink_fmt) { /* Check if the two ends match */ if (source_fmt->format.width != sink_fmt->format.width || @@ -440,8 +440,8 @@ static const struct v4l2_subdev_internal_ops ipipe_v4l2_internal_ops = { * return -EINVAL or zero on success */ static int ipipe_link_setup(struct media_entity *entity, - const struct media_pad *local, - const struct media_pad *remote, u32 flags) + const struct media_pad *local, + const struct media_pad *remote, u32 flags) { struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity); struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd); @@ -528,7 +528,7 @@ void omap4iss_ipipe_unregister_entities(struct iss_ipipe_device *ipipe) } int omap4iss_ipipe_register_entities(struct iss_ipipe_device *ipipe, - struct v4l2_device *vdev) + struct v4l2_device *vdev) { int ret; diff --git a/drivers/staging/media/omap4iss/iss_ipipe.h b/drivers/staging/media/omap4iss/iss_ipipe.h index b8c1b8e0a145..d5b441d9cb31 100644 --- a/drivers/staging/media/omap4iss/iss_ipipe.h +++ b/drivers/staging/media/omap4iss/iss_ipipe.h @@ -58,7 +58,7 @@ struct iss_ipipe_device { struct iss_device; int omap4iss_ipipe_register_entities(struct iss_ipipe_device *ipipe, - struct v4l2_device *vdev); + struct v4l2_device *vdev); void omap4iss_ipipe_unregister_entities(struct iss_ipipe_device *ipipe); int omap4iss_ipipe_init(struct iss_device *iss); diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c index 7c78ea1839a7..5f9e449e7007 100644 --- a/drivers/staging/media/omap4iss/iss_ipipeif.c +++ b/drivers/staging/media/omap4iss/iss_ipipeif.c @@ -446,8 +446,8 @@ ipipeif_try_format(struct iss_ipipeif_device *ipipeif, * return -EINVAL or zero on success */ static int ipipeif_enum_mbus_code(struct v4l2_subdev *sd, - struct v4l2_subdev_pad_config *cfg, - struct v4l2_subdev_mbus_code_enum *code) + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_mbus_code_enum *code) { struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd); struct v4l2_mbus_framefmt *format; @@ -480,8 +480,8 @@ static int ipipeif_enum_mbus_code(struct v4l2_subdev *sd, } static int ipipeif_enum_frame_size(struct v4l2_subdev *sd, - struct v4l2_subdev_pad_config *cfg, - struct v4l2_subdev_frame_size_enum *fse) + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_frame_size_enum *fse) { struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd); struct v4l2_mbus_framefmt format; @@ -570,7 +570,7 @@ static int ipipeif_set_format(struct v4l2_subdev *sd, fmt->which); *format = fmt->format; ipipeif_try_format(ipipeif, cfg, IPIPEIF_PAD_SOURCE_VP, format, - fmt->which); + fmt->which); } return 0; @@ -656,8 +656,8 @@ static const struct v4l2_subdev_internal_ops ipipeif_v4l2_internal_ops = { * return -EINVAL or zero on success */ static int ipipeif_link_setup(struct media_entity *entity, - const struct media_pad *local, - const struct media_pad *remote, u32 flags) + const struct media_pad *local, + const struct media_pad *remote, u32 flags) { struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity); struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd); @@ -778,7 +778,7 @@ void omap4iss_ipipeif_unregister_entities(struct iss_ipipeif_device *ipipeif) } int omap4iss_ipipeif_register_entities(struct iss_ipipeif_device *ipipeif, - struct v4l2_device *vdev) + struct v4l2_device *vdev) { int ret; diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.h b/drivers/staging/media/omap4iss/iss_ipipeif.h index cf8a47a932dc..c6bd96d9656c 100644 --- a/drivers/staging/media/omap4iss/iss_ipipeif.h +++ b/drivers/staging/media/omap4iss/iss_ipipeif.h @@ -80,13 +80,13 @@ struct iss_device; int omap4iss_ipipeif_init(struct iss_device *iss); void omap4iss_ipipeif_cleanup(struct iss_device *iss); int omap4iss_ipipeif_register_entities(struct iss_ipipeif_device *ipipeif, - struct v4l2_device *vdev); + struct v4l2_device *vdev); void omap4iss_ipipeif_unregister_entities(struct iss_ipipeif_device *ipipeif); int omap4iss_ipipeif_busy(struct iss_ipipeif_device *ipipeif); void omap4iss_ipipeif_isr(struct iss_ipipeif_device *ipipeif, u32 events); void omap4iss_ipipeif_restore_context(struct iss_device *iss); void omap4iss_ipipeif_max_rate(struct iss_ipipeif_device *ipipeif, - unsigned int *max_rate); + unsigned int *max_rate); #endif /* OMAP4_ISS_IPIPEIF_H */ diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c index bdcab8ceb4f0..9c8180bba77e 100644 --- a/drivers/staging/media/omap4iss/iss_resizer.c +++ b/drivers/staging/media/omap4iss/iss_resizer.c @@ -496,8 +496,8 @@ resizer_try_format(struct iss_resizer_device *resizer, * return -EINVAL or zero on success */ static int resizer_enum_mbus_code(struct v4l2_subdev *sd, - struct v4l2_subdev_pad_config *cfg, - struct v4l2_subdev_mbus_code_enum *code) + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_mbus_code_enum *code) { struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd); struct v4l2_mbus_framefmt *format; @@ -541,8 +541,8 @@ static int resizer_enum_mbus_code(struct v4l2_subdev *sd, } static int resizer_enum_frame_size(struct v4l2_subdev *sd, - struct v4l2_subdev_pad_config *cfg, - struct v4l2_subdev_frame_size_enum *fse) + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_frame_size_enum *fse) { struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd); struct v4l2_mbus_framefmt format; @@ -624,7 +624,7 @@ static int resizer_set_format(struct v4l2_subdev *sd, fmt->which); *format = fmt->format; resizer_try_format(resizer, cfg, RESIZER_PAD_SOURCE_MEM, format, - fmt->which); + fmt->which); } return 0; @@ -710,8 +710,8 @@ static const struct v4l2_subdev_internal_ops resizer_v4l2_internal_ops = { * return -EINVAL or zero on success */ static int resizer_link_setup(struct media_entity *entity, - const struct media_pad *local, - const struct media_pad *remote, u32 flags) + const struct media_pad *local, + const struct media_pad *remote, u32 flags) { struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity); struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd); @@ -820,7 +820,7 @@ void omap4iss_resizer_unregister_entities(struct iss_resizer_device *resizer) } int omap4iss_resizer_register_entities(struct iss_resizer_device *resizer, - struct v4l2_device *vdev) + struct v4l2_device *vdev) { int ret; diff --git a/drivers/staging/media/omap4iss/iss_resizer.h b/drivers/staging/media/omap4iss/iss_resizer.h index d2a49683a7d1..1e145abafc65 100644 --- a/drivers/staging/media/omap4iss/iss_resizer.h +++ b/drivers/staging/media/omap4iss/iss_resizer.h @@ -63,13 +63,13 @@ struct iss_device; int omap4iss_resizer_init(struct iss_device *iss); void omap4iss_resizer_cleanup(struct iss_device *iss); int omap4iss_resizer_register_entities(struct iss_resizer_device *resizer, - struct v4l2_device *vdev); + struct v4l2_device *vdev); void omap4iss_resizer_unregister_entities(struct iss_resizer_device *resizer); int omap4iss_resizer_busy(struct iss_resizer_device *resizer); void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events); void omap4iss_resizer_restore_context(struct iss_device *iss); void omap4iss_resizer_max_rate(struct iss_resizer_device *resizer, - unsigned int *max_rate); + unsigned int *max_rate); #endif /* OMAP4_ISS_RESIZER_H */ -- 2.20.1