redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[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>
hifive-unleashed-5.1
Paolo 'Blaisorblade' Giarrusso 2005-11-13 16:07:10 -08:00 committed by Linus Torvalds
parent c50d2c4d66
commit fd9bc53b99
5 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/um/drivers/fd.c
View File

@ -76,13 +76,6 @@ static void fd_close(int fd, void *d)
}
}
static int fd_console_write(int fd, const char *buf, int n, void *d)
{
struct fd_chan *data = d;
return(generic_console_write(fd, buf, n, &data->tt));
}
struct chan_ops fd_ops = {
.type = "fd",
.init = fd_init,
@ -90,7 +83,7 @@ struct chan_ops fd_ops = {
.close = fd_close,
.read = generic_read,
.write = generic_write,
.console_write = fd_console_write,
.console_write = generic_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 1,

9
arch/um/drivers/port_user.c
View File

@ -100,13 +100,6 @@ static void port_close(int fd, void *d)
os_close_file(fd);
}
static int port_console_write(int fd, const char *buf, int n, void *d)
{
struct port_chan *data = d;
return(generic_console_write(fd, buf, n, &data->tt));
}
struct chan_ops port_ops = {
.type = "port",
.init = port_init,
@ -114,7 +107,7 @@ struct chan_ops port_ops = {
.close = port_close,
.read = generic_read,
.write = generic_write,
.console_write = port_console_write,
.console_write = generic_console_write,
.window_size = generic_window_size,
.free = port_free,
.winch = 1,

11
arch/um/drivers/pty.c
View File

@ -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,

9
arch/um/drivers/tty.c
View File

@ -60,13 +60,6 @@ static int tty_open(int input, int output, int primary, void *d,
return(fd);
}
static int tty_console_write(int fd, const char *buf, int n, void *d)
{
struct tty_chan *data = d;
return(generic_console_write(fd, buf, n, &data->tt));
}
struct chan_ops tty_ops = {
.type = "tty",
.init = tty_chan_init,
@ -74,7 +67,7 @@ struct chan_ops tty_ops = {
.close = generic_close,
.read = generic_read,
.write = generic_write,
.console_write = tty_console_write,
.console_write = generic_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,

9
arch/um/drivers/xterm.c
View File

@ -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,