fbcon: delete unneeded function fbcon_takeover

Now there is no place use fbcon_takeover, and
fbcon_takeover has huge duplication code with
do_fbcon_takeover, we can achieve fbcon_takeover's
function with do_fbcon_takeover easily, so we
can just delete it.

Signed-off-by: Wang YanQing <udknight@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 84121da38474927b35c031e32750dc9c34720a66..e05fa83560681108d2391edaf382beb628622a75 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -556,34 +556,6 @@ static int do_fbcon_takeover(int show_logo)
        return err;
 }
 
-static int fbcon_takeover(int show_logo)
-{
-       int err, i;
-
-       if (!num_registered_fb)
-               return -ENODEV;
-
-       if (!show_logo)
-               logo_shown = FBCON_LOGO_DONTSHOW;
-
-       for (i = first_fb_vc; i <= last_fb_vc; i++)
-               con2fb_map[i] = info_idx;
-
-       err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
-                               fbcon_is_default);
-
-       if (err) {
-               for (i = first_fb_vc; i <= last_fb_vc; i++) {
-                       con2fb_map[i] = -1;
-               }
-               info_idx = -1;
-       } else {
-               fbcon_has_console_bind = 1;
-       }
-
-       return err;
-}
-
 #ifdef MODULE
 static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
                               int cols, int rows, int new_cols, int new_rows)