Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fbcon: Ditch error handling for con2fb_release_oldinfo

Browse Source 
It doesn't ever fail anymore.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Claudio Suarez <cssk@net-c.es>
Cc: Du Cheng <ducheng2@gmail.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Link: https://patchwork.freedesktop.org/patch/msgid/20220405210335.3434130-11-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2022-04-05 23:03:28 +02:00
parent bd6026a8c4
commit b07db39584
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/video/fbdev/core/fbcon.c
View File

@ -739,9 +739,8 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info,
return err; return err;
} }
static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo, static void con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,
struct fb_info *newinfo, int unit, struct fb_info *newinfo)
int oldidx, int found)
{ {
struct fbcon_ops *ops = oldinfo->fbcon_par; struct fbcon_ops *ops = oldinfo->fbcon_par;
int ret; int ret;
@ -770,8 +769,6 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,
"detected unhandled fb_set_par error, " "detected unhandled fb_set_par error, "
"error code %d\n", ret); "error code %d\n", ret);
} }
return 0;
} }
static void con2fb_init_display(struct vc_data *vc, struct fb_info *info, static void con2fb_init_display(struct vc_data *vc, struct fb_info *info,
@ -825,7 +822,7 @@ static int set_con2fb_map(int unit, int newidx, int user)
int oldidx = con2fb_map[unit]; int oldidx = con2fb_map[unit];
struct fb_info *info = registered_fb[newidx]; struct fb_info *info = registered_fb[newidx];
struct fb_info *oldinfo = NULL; struct fb_info *oldinfo = NULL;
int found, err = 0; int found, err = 0, show_logo;
WARN_CONSOLE_UNLOCKED(); WARN_CONSOLE_UNLOCKED();
@ -854,18 +851,15 @@ static int set_con2fb_map(int unit, int newidx, int user)
* fbcon should release it. * fbcon should release it.
*/ */
if (!err && oldinfo && !search_fb_in_map(oldidx)) if (!err && oldinfo && !search_fb_in_map(oldidx))
err = con2fb_release_oldinfo(vc, oldinfo, info, unit, oldidx, con2fb_release_oldinfo(vc, oldinfo, info);
found);
if (!err) { show_logo = (fg_console == 0 && !user &&
int show_logo = (fg_console == 0 && !user && logo_shown != FBCON_LOGO_DONTSHOW);
logo_shown != FBCON_LOGO_DONTSHOW);
if (!found) if (!found)
fbcon_add_cursor_work(info); fbcon_add_cursor_work(info);
con2fb_map_boot[unit] = newidx; con2fb_map_boot[unit] = newidx;
con2fb_init_display(vc, info, unit, show_logo); con2fb_init_display(vc, info, unit, show_logo);
}
if (!search_fb_in_map(info_idx)) if (!search_fb_in_map(info_idx))
info_idx = newidx; info_idx = newidx;
@ -2769,7 +2763,7 @@ static inline void fbcon_unbind(void) {}
/* called with console_lock held */ /* called with console_lock held */
void fbcon_fb_unbind(struct fb_info *info) void fbcon_fb_unbind(struct fb_info *info)
{ {
int i, new_idx = -1, ret = 0; int i, new_idx = -1;
int idx = info->node; int idx = info->node;
WARN_CONSOLE_UNLOCKED(); WARN_CONSOLE_UNLOCKED();
@ -2803,13 +2797,8 @@ void fbcon_fb_unbind(struct fb_info *info)
if (con2fb_map[i] == idx) { if (con2fb_map[i] == idx) {
con2fb_map[i] = -1; con2fb_map[i] = -1;
if (!search_fb_in_map(idx)) { if (!search_fb_in_map(idx)) {
ret = con2fb_release_oldinfo(vc_cons[i].d, con2fb_release_oldinfo(vc_cons[i].d,
info, NULL, i, info, NULL);
idx, 0);
if (ret) {
con2fb_map[i] = idx;
return;
}
} }
} }
} }