@@ -134,9 +134,9 @@ static int logo_shown = FBCON_LOGO_CANSHOW;
134
134
/* console mappings */
135
135
static unsigned int first_fb_vc ;
136
136
static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1 ;
137
- static int fbcon_is_default = 1 ;
137
+ static bool fbcon_is_default = true ;
138
138
static int primary_device = -1 ;
139
- static int fbcon_has_console_bind ;
139
+ static bool fbcon_has_console_bind ;
140
140
141
141
#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
142
142
static int map_override ;
@@ -288,7 +288,7 @@ static bool fbcon_skip_panic(struct fb_info *info)
288
288
#endif
289
289
}
290
290
291
- static inline int fbcon_is_active (struct vc_data * vc , struct fb_info * info )
291
+ static inline bool fbcon_is_active (struct vc_data * vc , struct fb_info * info )
292
292
{
293
293
struct fbcon_ops * ops = info -> fbcon_par ;
294
294
@@ -297,7 +297,7 @@ static inline int fbcon_is_active(struct vc_data *vc, struct fb_info *info)
297
297
}
298
298
299
299
static int get_color (struct vc_data * vc , struct fb_info * info ,
300
- u16 c , int is_fg )
300
+ u16 c , bool is_fg )
301
301
{
302
302
int depth = fb_get_color_depth (& info -> var , & info -> fix );
303
303
int color = 0 ;
@@ -365,12 +365,12 @@ static int get_color(struct vc_data *vc, struct fb_info *info,
365
365
366
366
static int get_fg_color (struct vc_data * vc , struct fb_info * info , u16 c )
367
367
{
368
- return get_color (vc , info , c , 1 );
368
+ return get_color (vc , info , c , true );
369
369
}
370
370
371
371
static int get_bg_color (struct vc_data * vc , struct fb_info * info , u16 c )
372
372
{
373
- return get_color (vc , info , c , 0 );
373
+ return get_color (vc , info , c , false );
374
374
}
375
375
376
376
static void fb_flashcursor (struct work_struct * work )
@@ -474,7 +474,7 @@ static int __init fb_console_setup(char *this_opt)
474
474
last_fb_vc = simple_strtoul (options , & options , 10 ) - 1 ;
475
475
if (last_fb_vc < first_fb_vc || last_fb_vc >= MAX_NR_CONSOLES )
476
476
last_fb_vc = MAX_NR_CONSOLES - 1 ;
477
- fbcon_is_default = 0 ;
477
+ fbcon_is_default = false ;
478
478
continue ;
479
479
}
480
480
@@ -569,7 +569,7 @@ static int do_fbcon_takeover(int show_logo)
569
569
con2fb_map [i ] = -1 ;
570
570
info_idx = -1 ;
571
571
} else {
572
- fbcon_has_console_bind = 1 ;
572
+ fbcon_has_console_bind = true ;
573
573
}
574
574
575
575
return err ;
@@ -2817,7 +2817,7 @@ static void fbcon_unbind(void)
2817
2817
fbcon_is_default );
2818
2818
2819
2819
if (!ret )
2820
- fbcon_has_console_bind = 0 ;
2820
+ fbcon_has_console_bind = false ;
2821
2821
}
2822
2822
#else
2823
2823
static inline void fbcon_unbind (void ) {}
@@ -3268,8 +3268,9 @@ static ssize_t cursor_blink_store(struct device *device,
3268
3268
const char * buf , size_t count )
3269
3269
{
3270
3270
struct fb_info * info ;
3271
- int blink , idx ;
3272
3271
char * * last = NULL ;
3272
+ bool blink ;
3273
+ int idx ;
3273
3274
3274
3275
console_lock ();
3275
3276
idx = con2fb_map [fg_console ];
0 commit comments