fbcon: delete delayed loading code

Before

commit f09b07274d6ced5e3072647da223ef1706638b69
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Aug 1 17:32:07 2017 +0200

    fbcon: Make fbcon a built-time depency for fbdev

it was possible to load fbcon and fbdev drivers in any order, which
means that fbcon init had to handle the case where fbdev drivers where
already registered.

This is no longer possible, hence delete that code.

Note that the exit case is a bit more complex and will be done in a
separate patch.

Since I had to audit the entire fbcon load code I also spotted a wrong
function name in a comment in fbcon_startup(), which this patch also
fixes.

v2: Explain why we also fix the comment (Sam)

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Claudio Suarez <cssk@net-c.es>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Du Cheng <ducheng2@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220405210335.3434130-5-daniel.vetter@ffwll.ch

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index b75e638cb83d3dbbe772780e436534b166210ed5..83f0223f53336883f3d8f96e6d61d34b132d71a3 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -944,7 +944,7 @@ static const char *fbcon_startup(void)
                return display_desc;
        /*
         * Instead of blindly using registered_fb[0], we use info_idx, set by
-        * fb_console_init();
+        * fbcon_fb_registered();
         */
        info = registered_fb[info_idx];
        if (!info)
@@ -3299,17 +3299,6 @@ static void fbcon_start(void)
                return;
        }
 #endif
-
-       if (num_registered_fb) {
-               int i;
-
-               for_each_registered_fb(i) {
-                       info_idx = i;
-                       break;
-               }
-
-               do_fbcon_takeover(0);
-       }
 }
 
 static void fbcon_exit(void)