Subject: [merged] fbcon-convert-last-two-unregister_con_driver-call-to-do_unregister_con_driver.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:32 -0700
The patch titled
Subject: fbcon: convert last two unregister_con_driver call to do_unregister_con_driver
has been removed from the -mm tree. Its filename was
fbcon-convert-last-two-unregister_con_driver-call-to-do_unregister_con_driver.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Wang YanQing <udknight@xxxxxxxxx>
Subject: fbcon: convert last two unregister_con_driver call to do_unregister_con_driver
There are only two place use unregister_con_driver now, this patch convert
them to do_unregister_con_driver too, then we can delete
unregister_con_driver whos function can be achieved with
do_unregister_con_driver easily to reduce code size and duplication.
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/tty/vt/vt.c | 4 +++-
drivers/video/console/fbcon.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/tty/vt/vt.c~fbcon-convert-last-two-unregister_con_driver-call-to-do_unregister_con_driver drivers/tty/vt/vt.c
--- a/drivers/tty/vt/vt.c~fbcon-convert-last-two-unregister_con_driver-call-to-do_unregister_con_driver
+++ a/drivers/tty/vt/vt.c
@@ -3629,7 +3629,9 @@ EXPORT_SYMBOL_GPL(do_take_over_console);
*/
void give_up_console(const struct consw *csw)
{
- unregister_con_driver(csw);
+ console_lock();
+ do_unregister_con_driver(csw);
+ console_unlock();
}
static int __init vtconsole_class_init(void)
diff -puN drivers/video/console/fbcon.c~fbcon-convert-last-two-unregister_con_driver-call-to-do_unregister_con_driver drivers/video/console/fbcon.c
--- a/drivers/video/console/fbcon.c~fbcon-convert-last-two-unregister_con_driver-call-to-do_unregister_con_driver
+++ a/drivers/video/console/fbcon.c
@@ -3621,8 +3621,8 @@ static void __exit fb_console_exit(void)
fbcon_deinit_device();
device_destroy(fb_class, MKDEV(0, 0));
fbcon_exit();
+ do_unregister_con_driver(&fb_con);
console_unlock();
- unregister_con_driver(&fb_con);
}
module_exit(fb_console_exit);
_
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
