Skip to content

Commit

Permalink
vt: add comment for unbind_con_driver()
Browse files Browse the repository at this point in the history
- add comment for unbind_con_driver().
- bind_con_driver() is made private again

Signed-off-by: Jesse Barnes <jesse.barnes@intel.com>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jesse Barnes authored and Linus Torvalds committed Jul 17, 2007
1 parent cfafca8 commit b7269dd
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
21 changes: 19 additions & 2 deletions drivers/char/vt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -2968,7 +2969,6 @@ int bind_con_driver(const struct consw *csw, int first, int last, int deflt)
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)
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions include/linux/vt_kern.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit b7269dd

Please sign in to comment.