fbcon: convert last two unregister_con_driver call to do_unregister_con_driver

[deliverable/linux.git] / drivers / tty / vt / vt.c

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 164cbeff5676ab995e25be83a0077f1ecf6bd986..8f4a71aa971e63a32dbd1423de43538ba5fec94d 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3088,17 +3088,6 @@ err:
 };
 
 
-static int bind_con_driver(const struct consw *csw, int first, int last,
-                          int deflt)
-{
-       int ret;
-
-       console_lock();
-       ret = do_bind_con_driver(csw, first, last, deflt);
-       console_unlock();
-       return ret;
-}
-
 #ifdef CONFIG_VT_HW_CONSOLE_BINDING
 static int con_is_graphics(const struct consw *csw, int first, int last)
 {
@@ -3236,8 +3225,11 @@ static int vt_bind(struct con_driver *con)
                if (first == 0 && last == MAX_NR_CONSOLES -1)
                        deflt = 1;
 
-               if (first != -1)
-                       bind_con_driver(csw, first, last, deflt);
+               if (first != -1) {
+                       console_lock();
+                       do_bind_con_driver(csw, first, last, deflt);
+                       console_unlock();
+               }
 
                first = -1;
                last = -1;
@@ -3639,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)