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@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index d5bfa869675b4672be00bbf852758ab930ecc62e..8f4a71aa971e63a32dbd1423de43538ba5fec94d 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3631,7 +3631,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 --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index e05fa83560681108d2391edaf382beb628622a75..a09c667c0c3ddbfbfb2d301c347123f4181d40a2 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/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);