Skip to contentSkip to conversation

fbcon: Adjust indentation in set_con2fb_map

PATCH In review Nathan Chancellor 3 participants 3 messages Dec 18, 2019 – Jan 15, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbcon: Adjust indentation in set_con2fb_map

Clang warns:

../drivers/video/fbdev/core/fbcon.c:915:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]

        return err;
        ^
../drivers/video/fbdev/core/fbcon.c:912:2: note: previous statement is
here
        if (!search_fb_in_map(info_idx))
        ^

1 warning generated.

This warning occurs because there is a space before the tab on this line. This happens on several lines in this function; normalize them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.

This warning was introduced before the beginning of git history so no fixes tab.

---
 drivers/video/fbdev/core/fbcon.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/video/fbdev/core/fbcon.c +13 -14
index c9235a2f42f8..9d2c43e345a4 100644
@@ -866,7 +866,7 @@ static int set_con2fb_map(int unit, int newidx, int user)
 	int oldidx = con2fb_map[unit];
 	struct fb_info *info = registered_fb[newidx];
 	struct fb_info *oldinfo = NULL;
- 	int found, err = 0;
+	int found, err = 0;
 
 	WARN_CONSOLE_UNLOCKED();
 
@@ -888,31 +888,30 @@ static int set_con2fb_map(int unit, int newidx, int user)
 
 	con2fb_map[unit] = newidx;
 	if (!err && !found)
- 		err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
-
+		err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
 
 	/*
 	 * If old fb is not mapped to any of the consoles,
 	 * fbcon should release it.
 	 */
- 	if (!err && oldinfo && !search_fb_in_map(oldidx))
- 		err = con2fb_release_oldinfo(vc, oldinfo, info, unit, oldidx,
- 					     found);
+	if (!err && oldinfo && !search_fb_in_map(oldidx))
+		err = con2fb_release_oldinfo(vc, oldinfo, info, unit, oldidx,
+					     found);
 
- 	if (!err) {
- 		int show_logo = (fg_console = 0 && !user &&
- 				 logo_shown != FBCON_LOGO_DONTSHOW);
+	if (!err) {
+		int show_logo = (fg_console = 0 && !user &&
+				 logo_shown != FBCON_LOGO_DONTSHOW);
 
- 		if (!found)
- 			fbcon_add_cursor_timer(info);
- 		con2fb_map_boot[unit] = newidx;
- 		con2fb_init_display(vc, info, unit, show_logo);
+		if (!found)
+			fbcon_add_cursor_timer(info);
+		con2fb_map_boot[unit] = newidx;
+		con2fb_init_display(vc, info, unit, show_logo);
 	}
 
 	if (!search_fb_in_map(info_idx))
 		info_idx = newidx;
 
- 	return err;
+	return err;
 }
 
 /*
Signature · 1 line
2.24.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 19 lines · Nathan Chancellor

Clang warns:

../drivers/video/fbdev/core/fbcon.c:915:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]

        return err;
        ^
../drivers/video/fbdev/core/fbcon.c:912:2: note: previous statement is
here
        if (!search_fb_in_map(info_idx))
        ^

1 warning generated.

This warning occurs because there is a space before the tab on this line. This happens on several lines in this function; normalize them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.

Quoted 5 lines

This warning was introduced before the beginning of git history so no fixes tab.

Thanks for the patch!

Quoted 68 lines
---
 drivers/video/fbdev/core/fbcon.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/video/fbdev/core/fbcon.c +13 -15
index c9235a2f42f8..9d2c43e345a4 100644
@@ -866,7 +866,7 @@ static int set_con2fb_map(int unit, int newidx, int user)
        int oldidx = con2fb_map[unit];
        struct fb_info *info = registered_fb[newidx];
        struct fb_info *oldinfo = NULL;
-       int found, err = 0;
+       int found, err = 0;
 
        WARN_CONSOLE_UNLOCKED();
 
@@ -888,31 +888,30 @@ static int set_con2fb_map(int unit, int newidx, int user)
 
        con2fb_map[unit] = newidx;
        if (!err && !found)
-               err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
-
+               err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
 
        /*
         * If old fb is not mapped to any of the consoles,
         * fbcon should release it.
         */
-       if (!err && oldinfo && !search_fb_in_map(oldidx))
-               err = con2fb_release_oldinfo(vc, oldinfo, info, unit, oldidx,
-                                            found);
+       if (!err && oldinfo && !search_fb_in_map(oldidx))
+               err = con2fb_release_oldinfo(vc, oldinfo, info, unit, oldidx,
+                                            found);
 
-       if (!err) {
-               int show_logo = (fg_console = 0 && !user &&
-                                logo_shown != FBCON_LOGO_DONTSHOW);
+       if (!err) {
+               int show_logo = (fg_console = 0 && !user &&
+                                logo_shown != FBCON_LOGO_DONTSHOW);
 
-               if (!found)
-                       fbcon_add_cursor_timer(info);
-               con2fb_map_boot[unit] = newidx;
-               con2fb_init_display(vc, info, unit, show_logo);
+               if (!found)
+                       fbcon_add_cursor_timer(info);
+               con2fb_map_boot[unit] = newidx;
+               con2fb_init_display(vc, info, unit, show_logo);
        }
 
        if (!search_fb_in_map(info_idx))
                info_idx = newidx;
 
-       return err;
+       return err;
 }
 
 /*
--

2.24.1

--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20191218025337.35044-1-natechancellor%40gmail.com.

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
Quoted 21 lines · Nick Desaulniers
Quoted 19 lines · Nathan Chancellor

Clang warns:

../drivers/video/fbdev/core/fbcon.c:915:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]

        return err;
        ^
../drivers/video/fbdev/core/fbcon.c:912:2: note: previous statement is
here
        if (!search_fb_in_map(info_idx))
        ^

1 warning generated.

This warning occurs because there is a space before the tab on this line. This happens on several lines in this function; normalize them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.

Quoted 8 lines
Quoted 5 lines

This warning was introduced before the beginning of git history so no fixes tab.

https://github.com/ClangBuiltLinux/linux/issues/824

Thanks for the patch!

Patch queued for v5.6, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Quoted 68 lines
Quoted 68 lines
---
 drivers/video/fbdev/core/fbcon.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/video/fbdev/core/fbcon.c +13 -15
index c9235a2f42f8..9d2c43e345a4 100644
@@ -866,7 +866,7 @@ static int set_con2fb_map(int unit, int newidx, int user)
        int oldidx = con2fb_map[unit];
        struct fb_info *info = registered_fb[newidx];
        struct fb_info *oldinfo = NULL;
-       int found, err = 0;
+       int found, err = 0;
 
        WARN_CONSOLE_UNLOCKED();
 
@@ -888,31 +888,30 @@ static int set_con2fb_map(int unit, int newidx, int user)
 
        con2fb_map[unit] = newidx;
        if (!err && !found)
-               err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
-
+               err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
 
        /*
         * If old fb is not mapped to any of the consoles,
         * fbcon should release it.
         */
-       if (!err && oldinfo && !search_fb_in_map(oldidx))
-               err = con2fb_release_oldinfo(vc, oldinfo, info, unit, oldidx,
-                                            found);
+       if (!err && oldinfo && !search_fb_in_map(oldidx))
+               err = con2fb_release_oldinfo(vc, oldinfo, info, unit, oldidx,
+                                            found);
 
-       if (!err) {
-               int show_logo = (fg_console = 0 && !user &&
-                                logo_shown != FBCON_LOGO_DONTSHOW);
+       if (!err) {
+               int show_logo = (fg_console = 0 && !user &&
+                                logo_shown != FBCON_LOGO_DONTSHOW);
 
-               if (!found)
-                       fbcon_add_cursor_timer(info);
-               con2fb_map_boot[unit] = newidx;
-               con2fb_init_display(vc, info, unit, show_logo);
+               if (!found)
+                       fbcon_add_cursor_timer(info);
+               con2fb_map_boot[unit] = newidx;
+               con2fb_init_display(vc, info, unit, show_logo);
        }
 
        if (!search_fb_in_map(info_idx))
                info_idx = newidx;
 
-       return err;
+       return err;
 }
 
 /*
--

2.24.1

--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://protect2.fireeye.com/url?k»9fa192-e64db737-bb9e2add-0cc47a31bee8-3ce98548f51cd7a2&u=https://groups.google.com/d/msgid/clang-built-linux/20191218025337.35044-1-natechancellor%40gmail.com.