[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, 2 insertions, 9 deletions

diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
index 0306a1b215b7..1c555c38de4d 100644
--- a/arch/um/drivers/pty.c
+++ b/arch/um/drivers/pty.c
@@ -118,13 +118,6 @@ static int pty_open(int input, int output, int primary, void *d,
         return(fd);
 }
 
-static int pty_console_write(int fd, const char *buf, int n, void *d)
-{
-        struct pty_chan *data = d;
-
-        return(generic_console_write(fd, buf, n, &data->tt));
-}
-
 struct chan_ops pty_ops = {
         .type           = "pty",
         .init           = pty_chan_init,
@@ -132,7 +125,7 @@ struct chan_ops pty_ops = {
         .close          = generic_close,
         .read           = generic_read,
         .write          = generic_write,
-        .console_write  = pty_console_write,
+        .console_write  = generic_console_write,
         .window_size    = generic_window_size,
         .free           = generic_free,
         .winch          = 0,
@@ -145,7 +138,7 @@ struct chan_ops pts_ops = {
         .close          = generic_close,
         .read           = generic_read,
         .write          = generic_write,
-        .console_write  = pty_console_write,
+        .console_write  = generic_console_write,
         .window_size    = generic_window_size,
         .free           = generic_free,
         .winch          = 0,