From b7269dd2b97b9aedb64e15fdec5575345d091925 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 17 Jul 2007 04:05:34 -0700 Subject: [PATCH] vt: add comment for unbind_con_driver() - add comment for unbind_con_driver(). - bind_con_driver() is made private again Signed-off-by: Jesse Barnes Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/vt.c | 21 +++++++++++++++++++-- include/linux/vt_kern.h | 2 -- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 8a389b314624..45b33cf97643 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -2869,7 +2869,8 @@ int __init vty_init(void) static struct class *vtconsole_class; -int bind_con_driver(const struct consw *csw, int first, int last, int deflt) +static int bind_con_driver(const struct consw *csw, int first, int last, + int deflt) { struct module *owner = csw->owner; const char *desc = NULL; @@ -2968,7 +2969,6 @@ err: module_put(owner); return retval; }; -EXPORT_SYMBOL(bind_con_driver); #ifdef CONFIG_VT_HW_CONSOLE_BINDING static int con_is_graphics(const struct consw *csw, int first, int last) @@ -2987,6 +2987,23 @@ static int con_is_graphics(const struct consw *csw, int first, int last) return retval; } +/** + * unbind_con_driver - unbind a console driver + * @csw: pointer to console driver to unregister + * @first: first in range of consoles that @csw should be unbound from + * @last: last in range of consoles that @csw should be unbound from + * @deflt: should next bound console driver be default after @csw is unbound? + * + * To unbind a driver from all possible consoles, pass 0 as @first and + * %MAX_NR_CONSOLES as @last. + * + * @deflt controls whether the console that ends up replacing @csw should be + * the default console. + * + * RETURNS: + * -ENODEV if @csw isn't a registered console driver or can't be unregistered + * or 0 on success. + */ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt) { struct module *owner = csw->owner; diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 0d034d89ee8a..699b7e9864fa 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h @@ -75,8 +75,6 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc); int vt_waitactive(int vt); void change_console(struct vc_data *new_vc); void reset_vc(struct vc_data *vc); -extern int bind_con_driver(const struct consw *csw, int first, int last, - int deflt); extern int unbind_con_driver(const struct consw *csw, int first, int last, int deflt); -- 2.20.1