leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] uml console channels: fix the API of console_write

Browse Source 
Since the 4th param is unused, remove it altogether.

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>
This commit is contained in:
Paolo 'Blaisorblade' Giarrusso 2005-11-13 16:07:11 -08:00 committed by Linus Torvalds
parent fd9bc53b99
commit 55c033c1f6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/um/drivers/chan_kern.c
View File

@ -89,8 +89,7 @@ static int not_configged_write(int fd, const char *buf, int len, void *data)
return(-EIO); return(-EIO);
} }
static int not_configged_console_write(int fd, const char *buf, int len, static int not_configged_console_write(int fd, const char *buf, int len)
void *data)
{ {
my_puts("Using a channel type which is configured out of " my_puts("Using a channel type which is configured out of "
"UML\n"); "UML\n");
@ -299,7 +298,7 @@ int console_write_chan(struct list_head *chans, const char *buf, int len)
chan = list_entry(ele, struct chan, list); chan = list_entry(ele, struct chan, list);
if(!chan->output || (chan->ops->console_write == NULL)) if(!chan->output || (chan->ops->console_write == NULL))
continue; continue;
n = chan->ops->console_write(chan->fd, buf, len, chan->data); n = chan->ops->console_write(chan->fd, buf, len);
if(chan->primary) ret = n; if(chan->primary) ret = n;
} }
return(ret); return(ret);

2
arch/um/drivers/chan_user.c
View File

@ -20,7 +20,7 @@
#include "choose-mode.h" #include "choose-mode.h"
#include "mode.h" #include "mode.h"
int generic_console_write(int fd, const char *buf, int n, void *unused) int generic_console_write(int fd, const char *buf, int n)
{ {
struct termios save, new; struct termios save, new;
int err; int err;

4
arch/um/include/chan_user.h
View File

@ -25,7 +25,7 @@ struct chan_ops {
void (*close)(int, void *); void (*close)(int, void *);
int (*read)(int, char *, void *); int (*read)(int, char *, void *);
int (*write)(int, const char *, int, void *); int (*write)(int, const char *, int, void *);
int (*console_write)(int, const char *, int, void *); int (*console_write)(int, const char *, int);
int (*window_size)(int, void *, unsigned short *, unsigned short *); int (*window_size)(int, void *, unsigned short *, unsigned short *);
void (*free)(void *); void (*free)(void *);
int winch; int winch;
@ -37,7 +37,7 @@ extern struct chan_ops fd_ops, null_ops, port_ops, pts_ops, pty_ops, tty_ops,
extern void generic_close(int fd, void *unused); extern void generic_close(int fd, void *unused);
extern int generic_read(int fd, char *c_out, void *unused); extern int generic_read(int fd, char *c_out, void *unused);
extern int generic_write(int fd, const char *buf, int n, void *unused); extern int generic_write(int fd, const char *buf, int n, void *unused);
extern int generic_console_write(int fd, const char *buf, int n, void *state); extern int generic_console_write(int fd, const char *buf, int n);
extern int generic_window_size(int fd, void *unused, unsigned short *rows_out, extern int generic_window_size(int fd, void *unused, unsigned short *rows_out,
unsigned short *cols_out); unsigned short *cols_out);
extern void generic_free(void *data); extern void generic_free(void *data);