Re: [PATCH RESEND v3 2/6] staging: media: atomisp: balance braces around if...else block

From: Fabio Aiuto
Date: Mon Apr 26 2021 - 05:57:24 EST


On Sun, Apr 25, 2021 at 02:12:20PM +0530, Deepak R Varma wrote:
> Balance braces around the if else blocks as per the code style guidelines.
> Resolves checkpatch script CHECK / WARNING feedback messages.
>
> Signed-off-by: Deepak R Varma <drv@xxxxxxxxx>
> ---
>
> Changes since v2:
> - None.
> Changes since v1:
> - None.
>
> drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 4 ++--
> drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 ++--
> drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 4 ++--
> drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 7 ++++---
> drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 4 ++--
> 5 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> index 6be3ee1d93a5..d68a2bcc9ae1 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> @@ -872,9 +872,9 @@ static int gc0310_s_power(struct v4l2_subdev *sd, int on)
> {
> int ret;
>
> - if (on == 0)
> + if (on == 0) {
> return power_down(sd);
> - else {
> + } else {
> ret = power_up(sd);
> if (!ret)
> return gc0310_init(sd);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> index 6ba4a8adff7c..e722c639b60d 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> @@ -658,9 +658,9 @@ static int gc2235_s_power(struct v4l2_subdev *sd, int on)
> {
> int ret;
>
> - if (on == 0)
> + if (on == 0) {
> ret = power_down(sd);
> - else {
> + } else {
> ret = power_up(sd);
> if (!ret)
> ret = __gc2235_init(sd);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> index f5de81132177..465fc4468442 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> @@ -568,9 +568,9 @@ static int power_down(struct v4l2_subdev *sd)
>
> static int mt9m114_s_power(struct v4l2_subdev *sd, int power)
> {
> - if (power == 0)
> + if (power == 0) {
> return power_down(sd);
> - else {
> + } else {
> if (power_up(sd))
> return -EINVAL;
>
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> index c90730513438..92c52431bd8f 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> @@ -461,11 +461,12 @@ static int ov2680_v_flip(struct v4l2_subdev *sd, s32 value)
> ret = ov2680_read_reg(client, 1, OV2680_FLIP_REG, &val);
> if (ret)
> return ret;
> - if (value) {
> +
> + if (value)
> val |= OV2680_FLIP_MIRROR_BIT_ENABLE;
> - } else {
> + else
> val &= ~OV2680_FLIP_MIRROR_BIT_ENABLE;
> - }
> +

Hi Deepak,

what you did above is not what is written in the commit message
description about. Here unneeded bracks are removed in both
branches, is not a matter of braces balancing.

thank you,

fabio

> ret = ov2680_write_reg(client, 1,
> OV2680_FLIP_REG, val);
> if (ret)
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> index aec7392fd1de..d046a9804f63 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> @@ -772,9 +772,9 @@ static int ov2722_s_power(struct v4l2_subdev *sd, int on)
> {
> int ret;
>
> - if (on == 0)
> + if (on == 0) {
> return power_down(sd);
> - else {
> + } else {
> ret = power_up(sd);
> if (!ret)
> return ov2722_init(sd);
> --
> 2.25.1
>
>
>
>