[PATCH] uml console channels: remove console_write wrappers

We were using a long series of (stupid) wrappers which all call
generic_console_write().  Since the wrappers only change the 4th param, which
is unused by the called proc, remove them and call generic_console_write()
directly.

If needed at any time in the future to reintroduce this stuff, the member
could be moved to a generic struct, to avoid this duplicated handling.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 8 deletions

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index b530f1a6540d..aaa636661043 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -194,13 +194,6 @@ static void xterm_free(void *d)
         free(d);
 }
 
-static int xterm_console_write(int fd, const char *buf, int n, void *d)
-{
-        struct xterm_chan *data = d;
-
-        return(generic_console_write(fd, buf, n, &data->tt));
-}
-
 struct chan_ops xterm_ops = {
         .type           = "xterm",
         .init           = xterm_init,
@@ -208,7 +201,7 @@ struct chan_ops xterm_ops = {
         .close          = xterm_close,
         .read           = generic_read,
         .write          = generic_write,
-        .console_write  = xterm_console_write,
+        .console_write  = generic_console_write,
         .window_size    = generic_window_size,
         .free           = xterm_free,
         .winch          = 1,