Commit 81b96e4a authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Helge Deller
Browse files

fbcon: Use 'bool' where appopriate 



Use 'bool' type where it makes more sense than 'int'.

v2: Rebase due to corrected 'fbcon_cursor_blink' initial value

Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 311b0784

drivers/video/fbdev/core/fbcon.c

+11 −10
Original line number Diff line number Diff line
@@ -134,9 +134,9 @@ static int logo_shown = FBCON_LOGO_CANSHOW; 
/* console mappings */

static unsigned int first_fb_vc;

static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1;

static int fbcon_is_default = 1;

static bool fbcon_is_default = true;

static int primary_device = -1;

static int fbcon_has_console_bind;

static bool fbcon_has_console_bind;



#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY

static int map_override;
@@ -288,7 +288,7 @@ static bool fbcon_skip_panic(struct fb_info *info) 
#endif

}



static inline int fbcon_is_active(struct vc_data *vc, struct fb_info *info)

static inline bool fbcon_is_active(struct vc_data *vc, struct fb_info *info)

{

	struct fbcon_ops *ops = info->fbcon_par;
@@ -297,7 +297,7 @@ static inline int fbcon_is_active(struct vc_data *vc, struct fb_info *info) 
}



static int get_color(struct vc_data *vc, struct fb_info *info,

	      u16 c, int is_fg)

		     u16 c, bool is_fg)

{

	int depth = fb_get_color_depth(&info->var, &info->fix);

	int color = 0;
@@ -365,12 +365,12 @@ static int get_color(struct vc_data *vc, struct fb_info *info, 


static int get_fg_color(struct vc_data *vc, struct fb_info *info, u16 c)

{

	return get_color(vc, info, c, 1);

	return get_color(vc, info, c, true);

}



static int get_bg_color(struct vc_data *vc, struct fb_info *info, u16 c)

{

	return get_color(vc, info, c, 0);

	return get_color(vc, info, c, false);

}



static void fb_flashcursor(struct work_struct *work)
@@ -474,7 +474,7 @@ static int __init fb_console_setup(char *this_opt) 
				last_fb_vc = simple_strtoul(options, &options, 10) - 1;

			if (last_fb_vc < first_fb_vc || last_fb_vc >= MAX_NR_CONSOLES)

				last_fb_vc = MAX_NR_CONSOLES - 1;

			fbcon_is_default = 0;

			fbcon_is_default = false;

			continue;

		}
@@ -569,7 +569,7 @@ static int do_fbcon_takeover(int show_logo) 
			con2fb_map[i] = -1;

		info_idx = -1;

	} else {

		fbcon_has_console_bind = 1;

		fbcon_has_console_bind = true;

	}



	return err;
@@ -2817,7 +2817,7 @@ static void fbcon_unbind(void) 
				fbcon_is_default);



	if (!ret)

		fbcon_has_console_bind = 0;

		fbcon_has_console_bind = false;

}

#else

static inline void fbcon_unbind(void) {}
@@ -3268,8 +3268,9 @@ static ssize_t cursor_blink_store(struct device *device, 
				  const char *buf, size_t count)

{

	struct fb_info *info;

	int blink, idx;

	char **last = NULL;

	bool blink;

	int idx;



	console_lock();

	idx = con2fb_map[fg_console];