# \[PATCH\] backlight: journada720: fix Wmisleading-indentation warning - Subsystems: FRAMEBUFFER LAYER, BACKLIGHT CLASS/SUBSYSTEM, THE REST - Maintainers: Helge Deller, Lee Jones, Daniel Thompson, Jingoo Han, Linus Torvalds - List: linux-fbdev - 3 messages, 3 authors - Page: https://ratatoskr.run/linux-fbdev/2021/03/6310962/t ## \[PATCH\] backlight: journada720: fix Wmisleading-indentation warning - From: Arnd Bergmann \ - Date: 2021-03-22 16:42:16 - Message: https://ratatoskr.run/linux-fbdev/2021/03/6310962.md ```text From: Arnd Bergmann 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 --- 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 ``` ## Re: \[PATCH\] backlight: journada720: fix Wmisleading-indentation warning - From: Daniel Thompson \ - Date: 2021-03-23 09:35:01 - Message: https://ratatoskr.run/linux-fbdev/2021/03/6311929.md ```text On Mon, Mar 22, 2021 at 05:41:28PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann > > 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 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. --- > 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 > ``` ## Re: \[PATCH\] backlight: journada720: fix Wmisleading-indentation warning - From: Lee Jones \ - Date: 2021-03-23 09:44:09 - Message: https://ratatoskr.run/linux-fbdev/2021/03/6311948.md ```text On Mon, 22 Mar 2021, Arnd Bergmann wrote: > From: Arnd Bergmann > > 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 > --- > 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 ```