Am 31.01.22 um 22:05 schrieb Daniel Vetter: > It's only one flag and slightly tidier code. > > Signed-off-by: Daniel Vetter > Cc: Daniel Vetter > Cc: Tetsuo Handa > Cc: Greg Kroah-Hartman > Cc: Du Cheng > Cc: Thomas Zimmermann > Cc: Claudio Suarez Acked-by: Thomas Zimmermann > --- > drivers/video/fbdev/core/fbcon.c | 11 +++++------ > drivers/video/fbdev/core/fbcon.h | 4 +--- > 2 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > index affb40658fee..fa30e1909164 100644 > --- a/drivers/video/fbdev/core/fbcon.c > +++ b/drivers/video/fbdev/core/fbcon.c > @@ -773,7 +773,7 @@ static void con2fb_init_display(struct vc_data *vc, struct fb_info *info, > > ops->currcon = fg_console; > > - if (info->fbops->fb_set_par && !(ops->flags & FBCON_FLAGS_INIT)) { > + if (info->fbops->fb_set_par && !ops->initialized) { > ret = info->fbops->fb_set_par(info); > > if (ret) > @@ -782,7 +782,7 @@ static void con2fb_init_display(struct vc_data *vc, struct fb_info *info, > "error code %d\n", ret); > } > > - ops->flags |= FBCON_FLAGS_INIT; > + ops->initialized = true; > ops->graphics = 0; > fbcon_set_disp(info, &info->var, unit); > > @@ -1101,8 +1101,7 @@ static void fbcon_init(struct vc_data *vc, int init) > * We need to do it in fbcon_init() to prevent screen corruption. > */ > if (con_is_visible(vc) && vc->vc_mode == KD_TEXT) { > - if (info->fbops->fb_set_par && > - !(ops->flags & FBCON_FLAGS_INIT)) { > + if (info->fbops->fb_set_par && !ops->initialized) { > ret = info->fbops->fb_set_par(info); > > if (ret) > @@ -1111,7 +1110,7 @@ static void fbcon_init(struct vc_data *vc, int init) > "error code %d\n", ret); > } > > - ops->flags |= FBCON_FLAGS_INIT; > + ops->initialized = true; > } > > ops->graphics = 0; > @@ -1186,7 +1185,7 @@ static void fbcon_deinit(struct vc_data *vc) > if (con_is_visible(vc)) > fbcon_del_cursor_work(info); > > - ops->flags &= ~FBCON_FLAGS_INIT; > + ops->initialized = false; > finished: > > fbcon_free_font(p, free_font); > diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h > index dce5ce41093e..b18d0cbf73b6 100644 > --- a/drivers/video/fbdev/core/fbcon.h > +++ b/drivers/video/fbdev/core/fbcon.h > @@ -18,8 +18,6 @@ > > #include > > -#define FBCON_FLAGS_INIT 1 > - > /* > * This is the interface between the low-level console driver and the > * low-level frame buffer device > @@ -77,7 +75,7 @@ struct fbcon_ops { > int blank_state; > int graphics; > int save_graphics; /* for debug enter/leave */ > - int flags; > + bool initialized; This will add 3 bytes of padding. Maybe you can put the bool elsewhere. > int rotate; > int cur_rotate; > char *cursor_data; -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev