leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vt: delete unneeded functions register_con_driver|take_over_console

Browse Source 
Now there is no place use register_con_driver|take_over_console,
and we can achieve their function with do_register_con_driver|
do_take_over_console easily, so just delete them to reduce code duplication.

Signed-off-by: Wang YanQing <udknight@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Wang YanQing 2013-05-09 02:13:59 +08:00 committed by Greg Kroah-Hartman
parent 7c80591c60
commit dc9641895a
2 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/tty/vt/vt.c
View File

@ -3576,26 +3576,6 @@ err:
return retval; return retval;
} }
/**
* register_con_driver - register console driver to console layer
* @csw: console driver
* @first: the first console to take over, minimum value is 0
* @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1
*
* DESCRIPTION: This function registers a console driver which can later
* bind to a range of consoles specified by @first and @last. It will
* also initialize the console driver by calling con_startup().
*/
int register_con_driver(const struct consw *csw, int first, int last)
{
int retval;
console_lock();
retval = do_register_con_driver(csw, first, last);
console_unlock();
return retval;
}
EXPORT_SYMBOL(register_con_driver);
/** /**
* unregister_con_driver - unregister console driver from console layer * unregister_con_driver - unregister console driver from console layer
@ -3677,30 +3657,6 @@ int do_take_over_console(const struct consw *csw, int first, int last, int deflt
} }
EXPORT_SYMBOL_GPL(do_take_over_console); EXPORT_SYMBOL_GPL(do_take_over_console);
/*
* If we support more console drivers, this function is used
* when a driver wants to take over some existing consoles
* and become default driver for newly opened ones.
*
* take_over_console is basically a register followed by unbind
*/
int take_over_console(const struct consw *csw, int first, int last, int deflt)
{
int err;
err = register_con_driver(csw, first, last);
/*
* If we get an busy error we still want to bind the console driver
* and return success, as we may have unbound the console driver
* but not unregistered it.
*/
if (err == -EBUSY)
err = 0;
if (!err)
bind_con_driver(csw, first, last, deflt);
return err;
}
/* /*
* give_up_console is a wrapper to unregister_con_driver. It will only * give_up_console is a wrapper to unregister_con_driver. It will only
@ -4264,6 +4220,5 @@ EXPORT_SYMBOL(console_blanked);
EXPORT_SYMBOL(vc_cons); EXPORT_SYMBOL(vc_cons);
EXPORT_SYMBOL(global_cursor_default); EXPORT_SYMBOL(global_cursor_default);
#ifndef VT_SINGLE_DRIVER #ifndef VT_SINGLE_DRIVER
EXPORT_SYMBOL(take_over_console);
EXPORT_SYMBOL(give_up_console); EXPORT_SYMBOL(give_up_console);
#endif #endif

2
include/linux/console.h
View File

@ -75,10 +75,8 @@ extern const struct consw newport_con; /* SGI Newport console */
extern const struct consw prom_con; /* SPARC PROM console */ extern const struct consw prom_con; /* SPARC PROM console */
int con_is_bound(const struct consw *csw); int con_is_bound(const struct consw *csw);
int register_con_driver(const struct consw *csw, int first, int last);
int unregister_con_driver(const struct consw *csw); int unregister_con_driver(const struct consw *csw);
int do_unregister_con_driver(const struct consw *csw); int do_unregister_con_driver(const struct consw *csw);
int take_over_console(const struct consw *sw, int first, int last, int deflt);
int do_take_over_console(const struct consw *sw, int first, int last, int deflt); int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
void give_up_console(const struct consw *sw); void give_up_console(const struct consw *sw);
#ifdef CONFIG_HW_CONSOLE #ifdef CONFIG_HW_CONSOLE