Commit 06cfbd38 authored by Thomas Zimmermann's avatar Thomas Zimmermann

fbcon: Remove trailing whitespaces

Fix coding style. No functional changes.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221219160516.23436-2-tzimmermann@suse.de
parent d912a35a
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
* Hardware cursor support added by Emmanuel Marty (core@ggi-project.org) * Hardware cursor support added by Emmanuel Marty (core@ggi-project.org)
* Smart redraw scrolling, arbitrary font width support, 512char font support * Smart redraw scrolling, arbitrary font width support, 512char font support
* and software scrollback added by * and software scrollback added by
* Jakub Jelinek (jj@ultra.linux.cz) * Jakub Jelinek (jj@ultra.linux.cz)
* *
* Random hacking by Martin Mares <mj@ucw.cz> * Random hacking by Martin Mares <mj@ucw.cz>
...@@ -127,7 +127,7 @@ static int logo_shown = FBCON_LOGO_CANSHOW; ...@@ -127,7 +127,7 @@ static int logo_shown = FBCON_LOGO_CANSHOW;
/* console mappings */ /* console mappings */
static unsigned int first_fb_vc; static unsigned int first_fb_vc;
static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1; static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1;
static int fbcon_is_default = 1; static int fbcon_is_default = 1;
static int primary_device = -1; static int primary_device = -1;
static int fbcon_has_console_bind; static int fbcon_has_console_bind;
...@@ -415,12 +415,12 @@ static int __init fb_console_setup(char *this_opt) ...@@ -415,12 +415,12 @@ static int __init fb_console_setup(char *this_opt)
strscpy(fontname, options + 5, sizeof(fontname)); strscpy(fontname, options + 5, sizeof(fontname));
continue; continue;
} }
if (!strncmp(options, "scrollback:", 11)) { if (!strncmp(options, "scrollback:", 11)) {
pr_warn("Ignoring scrollback size option\n"); pr_warn("Ignoring scrollback size option\n");
continue; continue;
} }
if (!strncmp(options, "map:", 4)) { if (!strncmp(options, "map:", 4)) {
options += 4; options += 4;
if (*options) { if (*options) {
...@@ -446,7 +446,7 @@ static int __init fb_console_setup(char *this_opt) ...@@ -446,7 +446,7 @@ static int __init fb_console_setup(char *this_opt)
last_fb_vc = simple_strtoul(options, &options, 10) - 1; last_fb_vc = simple_strtoul(options, &options, 10) - 1;
if (last_fb_vc < first_fb_vc || last_fb_vc >= MAX_NR_CONSOLES) if (last_fb_vc < first_fb_vc || last_fb_vc >= MAX_NR_CONSOLES)
last_fb_vc = MAX_NR_CONSOLES - 1; last_fb_vc = MAX_NR_CONSOLES - 1;
fbcon_is_default = 0; fbcon_is_default = 0;
continue; continue;
} }
...@@ -940,7 +940,7 @@ static const char *fbcon_startup(void) ...@@ -940,7 +940,7 @@ static const char *fbcon_startup(void)
info = fbcon_registered_fb[info_idx]; info = fbcon_registered_fb[info_idx];
if (!info) if (!info)
return NULL; return NULL;
if (fbcon_open(info)) if (fbcon_open(info))
return NULL; return NULL;
...@@ -1999,7 +1999,7 @@ static void updatescrollmode(struct fbcon_display *p, ...@@ -1999,7 +1999,7 @@ static void updatescrollmode(struct fbcon_display *p,
#define PITCH(w) (((w) + 7) >> 3) #define PITCH(w) (((w) + 7) >> 3)
#define CALC_FONTSZ(h, p, c) ((h) * (p) * (c)) /* size = height * pitch * charcount */ #define CALC_FONTSZ(h, p, c) ((h) * (p) * (c)) /* size = height * pitch * charcount */
static int fbcon_resize(struct vc_data *vc, unsigned int width, static int fbcon_resize(struct vc_data *vc, unsigned int width,
unsigned int height, unsigned int user) unsigned int height, unsigned int user)
{ {
struct fb_info *info = fbcon_info_from_console(vc->vc_num); struct fb_info *info = fbcon_info_from_console(vc->vc_num);
...@@ -2174,7 +2174,7 @@ static int fbcon_switch(struct vc_data *vc) ...@@ -2174,7 +2174,7 @@ static int fbcon_switch(struct vc_data *vc)
ops->update_start(info); ops->update_start(info);
} }
fbcon_set_palette(vc, color_table); fbcon_set_palette(vc, color_table);
fbcon_clear_margins(vc, 0); fbcon_clear_margins(vc, 0);
if (logo_shown == FBCON_LOGO_DRAW) { if (logo_shown == FBCON_LOGO_DRAW) {
...@@ -2343,7 +2343,7 @@ static void set_vc_hi_font(struct vc_data *vc, bool set) ...@@ -2343,7 +2343,7 @@ static void set_vc_hi_font(struct vc_data *vc, bool set)
vc->vc_complement_mask >>= 1; vc->vc_complement_mask >>= 1;
vc->vc_s_complement_mask >>= 1; vc->vc_s_complement_mask >>= 1;
} }
/* ++Edmund: reorder the attribute bits */ /* ++Edmund: reorder the attribute bits */
if (vc->vc_can_do_color) { if (vc->vc_can_do_color) {
unsigned short *cp = unsigned short *cp =
...@@ -2366,7 +2366,7 @@ static void set_vc_hi_font(struct vc_data *vc, bool set) ...@@ -2366,7 +2366,7 @@ static void set_vc_hi_font(struct vc_data *vc, bool set)
vc->vc_complement_mask <<= 1; vc->vc_complement_mask <<= 1;
vc->vc_s_complement_mask <<= 1; vc->vc_s_complement_mask <<= 1;
} }
/* ++Edmund: reorder the attribute bits */ /* ++Edmund: reorder the attribute bits */
{ {
unsigned short *cp = unsigned short *cp =
...@@ -2527,7 +2527,7 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, ...@@ -2527,7 +2527,7 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font,
/* Check if the same font is on some other console already */ /* Check if the same font is on some other console already */
for (i = first_fb_vc; i <= last_fb_vc; i++) { for (i = first_fb_vc; i <= last_fb_vc; i++) {
struct vc_data *tmp = vc_cons[i].d; struct vc_data *tmp = vc_cons[i].d;
if (fb_display[i].userfont && if (fb_display[i].userfont &&
fb_display[i].fontdata && fb_display[i].fontdata &&
FNTSUM(fb_display[i].fontdata) == csum && FNTSUM(fb_display[i].fontdata) == csum &&
...@@ -3435,5 +3435,5 @@ void __exit fb_console_exit(void) ...@@ -3435,5 +3435,5 @@ void __exit fb_console_exit(void)
do_unregister_con_driver(&fb_con); do_unregister_con_driver(&fb_con);
console_unlock(); console_unlock();
} }
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment