backlight: journada720: fix Wmisleading-indentation warning

Message ID 20210322164134.827091-1-arnd@kernel.org
State New
Headers show
Series
  • backlight: journada720: fix Wmisleading-indentation warning
Related show

Commit Message

Arnd Bergmann March 22, 2021, 4:41 p.m.
From: Arnd Bergmann <arnd@arndb.de>

With gcc-11, we get a warning about code that looks correct
but badly indented:

drivers/video/backlight/jornada720_bl.c: In function ‘jornada_bl_update_status’:
drivers/video/backlight/jornada720_bl.c:66:11: error: this ‘else’ clause does not guard... [-Werror=misleading-indentation]
   66 |         } else  /* turn on backlight */
      |           ^~~~

Change the formatting according to our normal conventions.

Fixes: 13a7b5dc0d17 ("backlight: Adds HP Jornada 700 series backlight driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/video/backlight/jornada720_bl.c | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

Comments

Daniel Thompson March 23, 2021, 9:34 a.m. | #1
On Mon, Mar 22, 2021 at 05:41:28PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> With gcc-11, we get a warning about code that looks correct
> but badly indented:
> 
> drivers/video/backlight/jornada720_bl.c: In function ‘jornada_bl_update_status’:
> drivers/video/backlight/jornada720_bl.c:66:11: error: this ‘else’ clause does not guard... [-Werror=misleading-indentation]
>    66 |         } else  /* turn on backlight */
>       |           ^~~~
> 
> Change the formatting according to our normal conventions.
> 
> Fixes: 13a7b5dc0d17 ("backlight: Adds HP Jornada 700 series backlight driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I'm dubious that the re-indent matches the original authors intent...
but it certainly does match what was actually written and tested so
on that basis:

Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>


Daniel.


 ---
>  drivers/video/backlight/jornada720_bl.c | 44 ++++++++++++-------------
>  1 file changed, 22 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
> index 996f7ba3b373..066d0dc98f60 100644
> --- a/drivers/video/backlight/jornada720_bl.c
> +++ b/drivers/video/backlight/jornada720_bl.c
> @@ -66,30 +66,30 @@ static int jornada_bl_update_status(struct backlight_device *bd)
>  	} else  /* turn on backlight */
>  		PPSR |= PPC_LDD1;
>  
> -		/* send command to our mcu */
> -		if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {
> -			dev_info(&bd->dev, "failed to set brightness\n");
> -			ret = -ETIMEDOUT;
> -			goto out;
> -		}
> +	/* send command to our mcu */
> +	if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {
> +		dev_info(&bd->dev, "failed to set brightness\n");
> +		ret = -ETIMEDOUT;
> +		goto out;
> +	}
>  
> -		/*
> -		 * at this point we expect that the mcu has accepted
> -		 * our command and is waiting for our new value
> -		 * please note that maximum brightness is 255,
> -		 * but due to physical layout it is equal to 0, so we simply
> -		 * invert the value (MAX VALUE - NEW VALUE).
> -		 */
> -		if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness)
> -			!= TXDUMMY) {
> -			dev_err(&bd->dev, "set brightness failed\n");
> -			ret = -ETIMEDOUT;
> -		}
> +	/*
> +	 * at this point we expect that the mcu has accepted
> +	 * our command and is waiting for our new value
> +	 * please note that maximum brightness is 255,
> +	 * but due to physical layout it is equal to 0, so we simply
> +	 * invert the value (MAX VALUE - NEW VALUE).
> +	 */
> +	if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness)
> +		!= TXDUMMY) {
> +		dev_err(&bd->dev, "set brightness failed\n");
> +		ret = -ETIMEDOUT;
> +	}
>  
> -		/*
> -		 * If infact we get an TXDUMMY as output we are happy and dont
> -		 * make any further comments about it
> -		 */
> +	/*
> +	 * If infact we get an TXDUMMY as output we are happy and dont
> +	 * make any further comments about it
> +	 */
>  out:
>  	jornada_ssp_end();
>  
> -- 
> 2.29.2
>
Lee Jones March 23, 2021, 9:43 a.m. | #2
On Mon, 22 Mar 2021, Arnd Bergmann wrote:

> From: Arnd Bergmann <arnd@arndb.de>
> 
> With gcc-11, we get a warning about code that looks correct
> but badly indented:
> 
> drivers/video/backlight/jornada720_bl.c: In function ‘jornada_bl_update_status’:
> drivers/video/backlight/jornada720_bl.c:66:11: error: this ‘else’ clause does not guard... [-Werror=misleading-indentation]
>    66 |         } else  /* turn on backlight */
>       |           ^~~~
> 
> Change the formatting according to our normal conventions.
> 
> Fixes: 13a7b5dc0d17 ("backlight: Adds HP Jornada 700 series backlight driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/video/backlight/jornada720_bl.c | 44 ++++++++++++-------------
>  1 file changed, 22 insertions(+), 22 deletions(-)

Applied, thanks.

Patch

diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index 996f7ba3b373..066d0dc98f60 100644
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -66,30 +66,30 @@  static int jornada_bl_update_status(struct backlight_device *bd)
 	} else  /* turn on backlight */
 		PPSR |= PPC_LDD1;
 
-		/* send command to our mcu */
-		if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {
-			dev_info(&bd->dev, "failed to set brightness\n");
-			ret = -ETIMEDOUT;
-			goto out;
-		}
+	/* send command to our mcu */
+	if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {
+		dev_info(&bd->dev, "failed to set brightness\n");
+		ret = -ETIMEDOUT;
+		goto out;
+	}
 
-		/*
-		 * at this point we expect that the mcu has accepted
-		 * our command and is waiting for our new value
-		 * please note that maximum brightness is 255,
-		 * but due to physical layout it is equal to 0, so we simply
-		 * invert the value (MAX VALUE - NEW VALUE).
-		 */
-		if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness)
-			!= TXDUMMY) {
-			dev_err(&bd->dev, "set brightness failed\n");
-			ret = -ETIMEDOUT;
-		}
+	/*
+	 * at this point we expect that the mcu has accepted
+	 * our command and is waiting for our new value
+	 * please note that maximum brightness is 255,
+	 * but due to physical layout it is equal to 0, so we simply
+	 * invert the value (MAX VALUE - NEW VALUE).
+	 */
+	if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness)
+		!= TXDUMMY) {
+		dev_err(&bd->dev, "set brightness failed\n");
+		ret = -ETIMEDOUT;
+	}
 
-		/*
-		 * If infact we get an TXDUMMY as output we are happy and dont
-		 * make any further comments about it
-		 */
+	/*
+	 * If infact we get an TXDUMMY as output we are happy and dont
+	 * make any further comments about it
+	 */
 out:
 	jornada_ssp_end();