From: Wang YanQing <udknight@gmail.com>
Date: Wed, 8 May 2013 18:14:07 +0000 (+0800)
Subject: vt: convert last unbind_con_driver call to do_unbind_con_driver
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=618f2b90077ef22e5c7025fca4e9027bf75d918f;p=linux-beck.git

vt: convert last unbind_con_driver call to do_unbind_con_driver

There is only one place use unbind_con_driver, this patch
convert it to do_unbind_con_driver too, then we can delete
unbind_con_driver 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 852d470d674b..a422322cf8b9 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3303,8 +3303,11 @@ static int vt_unbind(struct con_driver *con)
 		if (first == 0 && last == MAX_NR_CONSOLES -1)
 			deflt = 1;
 
-		if (first != -1)
-			unbind_con_driver(csw, first, last, deflt);
+		if (first != -1) {
+			console_lock();
+			do_unbind_con_driver(csw, first, last, deflt);
+			console_unlock();
+		}
 
 		first = -1;
 		last = -1;