diff options
| author | Wang YanQing <udknight@gmail.com> | 2013-05-09 02:14:39 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-20 12:27:59 -0700 |
| commit | 70125e76b0a7aec5035ca45076b96e5f9e230ef7 (patch) | |
| tree | a009f959b4eec059facc5681dc925067546d4f8d | |
| parent | 77d6c98454f0443f03ec690fb0ea25a26c01ddcb (diff) | |
| download | op-kernel-dev-70125e76b0a7aec5035ca45076b96e5f9e230ef7.zip op-kernel-dev-70125e76b0a7aec5035ca45076b96e5f9e230ef7.tar.gz | |
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>
| -rw-r--r-- | drivers/tty/vt/vt.c | 4 | ||||
| -rw-r--r-- | drivers/video/console/fbcon.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index d5bfa86..8f4a71a 100644 --- 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 e05fa83..a09c667 100644 --- 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); |
