Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50539dd4 authored by Wang YanQing's avatar Wang YanQing Committed by Greg Kroah-Hartman
Browse files

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: default avatarWang YanQing <udknight@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70125e76

drivers/tty/vt/vt.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -3545,7 +3545,7 @@ static int do_register_con_driver(const struct consw *csw, int first, int last) 








/**

/**

 * unregister_con_driver - unregister console driver from console layer

 * do_unregister_con_driver - unregister console driver from console layer

 * @csw: console driver

 * @csw: console driver

 *

 *

 * DESCRIPTION: All drivers that registers to the console layer must

 * DESCRIPTION: All drivers that registers to the console layer must
@@ -3555,17 +3555,6 @@ static int do_register_con_driver(const struct consw *csw, int first, int last) 
 *

 *

 * The driver must unbind first prior to unregistration.

 * 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 do_unregister_con_driver(const struct consw *csw)

{

{

	int i, retval = -ENODEV;

	int i, retval = -ENODEV;

include/linux/console.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ 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 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 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);