Skip to contentSkip to conversation

fbcon: delete unneeded function fbcon_takeover

PATCH In review Wang YanQing 1 participant 1 message May 8, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/9 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.

---
 drivers/video/console/fbcon.c | 28 ----------------------------
 1 file changed, 28 deletions(-)
drivers/video/console/fbcon.c +0 -28
index 1660644..47b9353 100644
@@ -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)
Signature · 1 line
1.7.12.4.dirty