Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c033c1 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

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



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

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fd9bc53b

arch/um/drivers/chan_kern.c

+2 −3
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ static int not_configged_write(int fd, const char *buf, int len, void *data) 
	return(-EIO);

}



static int not_configged_console_write(int fd, const char *buf, int len,

				       void *data)

static int not_configged_console_write(int fd, const char *buf, int len)

{

	my_puts("Using a channel type which is configured out of "

	       "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);

		if(!chan->output || (chan->ops->console_write == NULL))

			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;

	}

	return(ret);

arch/um/drivers/chan_user.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "choose-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;

	int err;

arch/um/include/chan_user.h

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct chan_ops { 
	void (*close)(int, void *);

	int (*read)(int, char *, 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 *);

	void (*free)(void *);

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

			       unsigned short *cols_out);

extern void generic_free(void *data);