summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWang YanQing <udknight@gmail.com>2013-05-08 18:14:44 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-20 19:27:59 (GMT)
commit50539dd4f88e8a689a38c94337768fd7ff3fd326 (patch)
treedfd614a2ebffc296a372a727023ba97327b34e4d
parent70125e76b0a7aec5035ca45076b96e5f9e230ef7 (diff)
downloadlinux-50539dd4f88e8a689a38c94337768fd7ff3fd326.tar.xz
vt: delete unneeded function unregister_con_driver
Now there is no place use unregister_con_driver, and we can achieve unregister_con_driver's function with unregister_con_driver easily, so just delete it 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.c13
-rw-r--r--include/linux/console.h1
2 files changed, 1 insertions, 13 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 8f4a71a..405e1c9 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3545,7 +3545,7 @@ err:
/**
- * unregister_con_driver - unregister console driver from console layer
+ * do_unregister_con_driver - unregister console driver from console layer
* @csw: console driver
*
* DESCRIPTION: All drivers that registers to the console layer must
@@ -3555,17 +3555,6 @@ err:
*
* The driver must unbind first prior to unregistration.
*/
-int unregister_con_driver(const struct consw *csw)
-{
- int retval;
-
- console_lock();
- retval = do_unregister_con_driver(csw);
- console_unlock();
- return retval;
-}
-EXPORT_SYMBOL(unregister_con_driver);
-
int do_unregister_con_driver(const struct consw *csw)
{
int i, retval = -ENODEV;
diff --git a/include/linux/console.h b/include/linux/console.h
index 8f9bd96..7571a16 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -75,7 +75,6 @@ extern const struct consw newport_con; /* SGI Newport console */
extern const struct consw prom_con; /* SPARC PROM console */
int con_is_bound(const struct consw *csw);
-int unregister_con_driver(const struct consw *csw);
int do_unregister_con_driver(const struct consw *csw);
int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
void give_up_console(const struct consw *sw);