aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang YanQing <udknight@gmail.com>2013-05-08 14:14:44 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-20 15:27:59 -0400
commit50539dd4f88e8a689a38c94337768fd7ff3fd326 (patch)
treedfd614a2ebffc296a372a727023ba97327b34e4d
parent70125e76b0a7aec5035ca45076b96e5f9e230ef7 (diff)
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 8f4a71aa971e..405e1c90ada2 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3545,7 +3545,7 @@ err:
3545 3545
3546 3546
3547/** 3547/**
3548 * unregister_con_driver - unregister console driver from console layer 3548 * do_unregister_con_driver - unregister console driver from console layer
3549 * @csw: console driver 3549 * @csw: console driver
3550 * 3550 *
3551 * DESCRIPTION: All drivers that registers to the console layer must 3551 * DESCRIPTION: All drivers that registers to the console layer must
@@ -3555,17 +3555,6 @@ err:
3555 * 3555 *
3556 * The driver must unbind first prior to unregistration. 3556 * The driver must unbind first prior to unregistration.
3557 */ 3557 */
3558int unregister_con_driver(const struct consw *csw)
3559{
3560 int retval;
3561
3562 console_lock();
3563 retval = do_unregister_con_driver(csw);
3564 console_unlock();
3565 return retval;
3566}
3567EXPORT_SYMBOL(unregister_con_driver);
3568
3569int do_unregister_con_driver(const struct consw *csw) 3558int do_unregister_con_driver(const struct consw *csw)
3570{ 3559{
3571 int i, retval = -ENODEV; 3560 int i, retval = -ENODEV;
diff --git a/include/linux/console.h b/include/linux/console.h
index 8f9bd966dbc6..7571a16bd653 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -75,7 +75,6 @@ extern const struct consw newport_con; /* SGI Newport console */
75extern const struct consw prom_con; /* SPARC PROM console */ 75extern const struct consw prom_con; /* SPARC PROM console */
76 76
77int con_is_bound(const struct consw *csw); 77int con_is_bound(const struct consw *csw);
78int unregister_con_driver(const struct consw *csw);
79int do_unregister_con_driver(const struct consw *csw); 78int do_unregister_con_driver(const struct consw *csw);
80int do_take_over_console(const struct consw *sw, int first, int last, int deflt); 79int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
81void give_up_console(const struct consw *sw); 80void give_up_console(const struct consw *sw);