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(-)
@@ -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;-gotoout;-}+/* send command to our mcu */+if(jornada_ssp_byte(SETBRIGHTNESS)!=TXDUMMY){+dev_info(&bd->dev,"failed to set brightness\n");+ret=-ETIMEDOUT;+gotoout;+}-/*-*atthispointweexpectthatthemcuhasaccepted-*ourcommandandiswaitingforournewvalue-*pleasenotethatmaximumbrightnessis255,-*butduetophysicallayoutitisequalto0,sowesimply-*invertthevalue(MAXVALUE-NEWVALUE).-*/-if(jornada_ssp_byte(BL_MAX_BRIGHT-bd->props.brightness)-!=TXDUMMY){-dev_err(&bd->dev,"set brightness failed\n");-ret=-ETIMEDOUT;-}+/*+*atthispointweexpectthatthemcuhasaccepted+*ourcommandandiswaitingforournewvalue+*pleasenotethatmaximumbrightnessis255,+*butduetophysicallayoutitisequalto0,sowesimply+*invertthevalue(MAXVALUE-NEWVALUE).+*/+if(jornada_ssp_byte(BL_MAX_BRIGHT-bd->props.brightness)+!=TXDUMMY){+dev_err(&bd->dev,"set brightness failed\n");+ret=-ETIMEDOUT;+}-/*-*IfinfactwegetanTXDUMMYasoutputwearehappyanddont-*makeanyfurthercommentsaboutit-*/+/*+*IfinfactwegetanTXDUMMYasoutputwearehappyanddont+*makeanyfurthercommentsaboutit+*/out:jornada_ssp_end();
From: Daniel Thompson <hidden> Date: 2021-03-23 09:35:01
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 <redacted>
Daniel.
---
@@ -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;-gotoout;-}+/* send command to our mcu */+if(jornada_ssp_byte(SETBRIGHTNESS)!=TXDUMMY){+dev_info(&bd->dev,"failed to set brightness\n");+ret=-ETIMEDOUT;+gotoout;+}-/*-*atthispointweexpectthatthemcuhasaccepted-*ourcommandandiswaitingforournewvalue-*pleasenotethatmaximumbrightnessis255,-*butduetophysicallayoutitisequalto0,sowesimply-*invertthevalue(MAXVALUE-NEWVALUE).-*/-if(jornada_ssp_byte(BL_MAX_BRIGHT-bd->props.brightness)-!=TXDUMMY){-dev_err(&bd->dev,"set brightness failed\n");-ret=-ETIMEDOUT;-}+/*+*atthispointweexpectthatthemcuhasaccepted+*ourcommandandiswaitingforournewvalue+*pleasenotethatmaximumbrightnessis255,+*butduetophysicallayoutitisequalto0,sowesimply+*invertthevalue(MAXVALUE-NEWVALUE).+*/+if(jornada_ssp_byte(BL_MAX_BRIGHT-bd->props.brightness)+!=TXDUMMY){+dev_err(&bd->dev,"set brightness failed\n");+ret=-ETIMEDOUT;+}-/*-*IfinfactwegetanTXDUMMYasoutputwearehappyanddont-*makeanyfurthercommentsaboutit-*/+/*+*IfinfactwegetanTXDUMMYasoutputwearehappyanddont+*makeanyfurthercommentsaboutit+*/out:jornada_ssp_end();
From: Lee Jones <hidden> Date: 2021-03-23 09:44:09
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.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog