Subject: [merged] fbcon-delete-unneeded-function-fbcon_takeover.patch removed from -mm tree
To: udknight@xxxxxxxxx,FlorianSchandinat@xxxxxx,airlied@xxxxxxxx,daniel.vetter@xxxxxxxx,greg@xxxxxxxxx,huax.lu@xxxxxxxxx,jslaby@xxxxxxx,maarten.lankhorst@xxxxxxxxxxxxx,sedat.dilek@xxxxxxxxx,tiwai@xxxxxxx,tomi.valkeinen@xxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 22 May 2013 12:33:20 -0700
The patch titled
Subject: fbcon: delete unneeded function fbcon_takeover
has been removed from the -mm tree. Its filename was
fbcon-delete-unneeded-function-fbcon_takeover.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Wang YanQing <udknight@xxxxxxxxx>
Subject: 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@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Jiri Slaby <jslaby@xxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Cc: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
Cc: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>
Cc: Lu Hua <huax.lu@xxxxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/console/fbcon.c | 28 ----------------------------
1 file changed, 28 deletions(-)
diff -puN drivers/video/console/fbcon.c~fbcon-delete-unneeded-function-fbcon_takeover drivers/video/console/fbcon.c
--- a/drivers/video/console/fbcon.c~fbcon-delete-unneeded-function-fbcon_takeover
+++ a/drivers/video/console/fbcon.c
@@ -556,34 +556,6 @@ static int do_fbcon_takeover(int show_lo
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)
_
Patches currently in -mm which might be from udknight@xxxxxxxxx are
linux-next.patch
fbcon-convert-last-fbcon_takeover-call-to-do_fbcon_takeover.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
