Subject: [merged] vt-delete-unneeded-function-unregister_con_driver.patch removed from -mm tree
To: udknight@xxxxxxxxx,FlorianSchandinat@xxxxxx,airlied@xxxxxxxx,daniel.vetter@xxxxxxxx,greg@xxxxxxxxx,huax.lu@xxxxxxxxx,jslaby@xxxxxxx,maarten.lankhorst@xxxxxxxxxxxxx,sedat.dilek@xxxxxxxxx,tiwai@xxxxxxx,tomi.valkeinen@xxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 22 May 2013 12:33:34 -0700
The patch titled
Subject: vt: delete unneeded function unregister_con_driver
has been removed from the -mm tree. Its filename was
vt-delete-unneeded-function-unregister_con_driver.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Wang YanQing <udknight@xxxxxxxxx>
Subject: 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@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Jiri Slaby <jslaby@xxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Cc: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
Cc: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>
Cc: Lu Hua <huax.lu@xxxxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/tty/vt/vt.c | 13 +------------
include/linux/console.h | 1 -
2 files changed, 1 insertion(+), 13 deletions(-)
diff -puN drivers/tty/vt/vt.c~vt-delete-unneeded-function-unregister_con_driver drivers/tty/vt/vt.c
--- a/drivers/tty/vt/vt.c~vt-delete-unneeded-function-unregister_con_driver
+++ a/drivers/tty/vt/vt.c
@@ -3543,7 +3543,7 @@ err:
/**
- * unregister_con_driver - unregister console driver from console layer
+ * do_unregister_con_driver - unregister console driver from console layer
* @csw: console driver
*
* DESCRIPTION: All drivers that registers to the console layer must
@@ -3553,17 +3553,6 @@ err:
*
* 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 i, retval = -ENODEV;
diff -puN include/linux/console.h~vt-delete-unneeded-function-unregister_con_driver include/linux/console.h
--- a/include/linux/console.h~vt-delete-unneeded-function-unregister_con_driver
+++ a/include/linux/console.h
@@ -75,7 +75,6 @@ extern const struct consw newport_con; /
extern const struct consw prom_con; /* SPARC PROM console */
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_take_over_console(const struct consw *sw, int first, int last, int deflt);
void give_up_console(const struct consw *sw);
_
Patches currently in -mm which might be from udknight@xxxxxxxxx are
linux-next.patch
fbcon-convert-last-fbcon_takeover-call-to-do_fbcon_takeover.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
