Commit a52f362f authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: mostly const a structure 



The chan_opts structure is mostly const, and needs no locking.  Comment the
lack of locking on the one field that can change.

Make all the other fields const.  It turned out that console_open_chan didn't
use its chan_opts argument, so that is deleted from the function and its
callers.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 99b0278f

arch/um/drivers/chan_kern.c

+2 −3
Original line number Diff line number Diff line
@@ -354,8 +354,7 @@ int console_write_chan(struct list_head *chans, const char *buf, int len) 
	return ret;

}



int console_open_chan(struct line *line, struct console *co,

		      const struct chan_opts *opts)

int console_open_chan(struct line *line, struct console *co)

{

	int err;

arch/um/drivers/ssl.c

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static void ssl_announce(char *dev_name, int dev) 
	       dev_name);

}



/* Almost const, except that xterm_title may be changed in an initcall */

static struct chan_opts opts = {

	.announce 	= ssl_announce,

	.xterm_title	= "Serial Line #%d",
@@ -171,7 +172,7 @@ static int ssl_console_setup(struct console *co, char *options) 
{

	struct line *line = &serial_lines[co->index];



	return console_open_chan(line, co, &opts);

	return console_open_chan(line, co);

}



static struct console ssl_cons = {

arch/um/drivers/stdio_console.c

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ void stdio_announce(char *dev_name, int dev) 
	       dev_name);

}



/* Almost const, except that xterm_title may be changed in an initcall */

static struct chan_opts opts = {

	.announce 	= stdio_announce,

	.xterm_title	= "Virtual Console #%d",
@@ -144,7 +145,7 @@ static int uml_console_setup(struct console *co, char *options) 
{

	struct line *line = &vts[co->index];



	return console_open_chan(line, co, &opts);

	return console_open_chan(line, co);

}



static struct console stdiocons = {

arch/um/include/chan_kern.h

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ extern int write_chan(struct list_head *chans, const char *buf, int len, 
			     int write_irq);

extern int console_write_chan(struct list_head *chans, const char *buf, 

			      int len);

extern int console_open_chan(struct line *line, struct console *co,

			     const struct chan_opts *opts);

extern int console_open_chan(struct line *line, struct console *co);

extern void deactivate_chan(struct list_head *chans, int irq);

extern void reactivate_chan(struct list_head *chans, int irq);

extern void chan_enable_winch(struct list_head *chans, struct tty_struct *tty);

arch/um/include/chan_user.h

+4 −4
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 
#include "init.h"



struct chan_opts {

	void (*announce)(char *dev_name, int dev);

	void (*const announce)(char *dev_name, int dev);

	char *xterm_title;

	int raw;

	unsigned long tramp_stack;

	int in_kernel;

	const int raw;

	const unsigned long tramp_stack;

	const int in_kernel;

};



enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE };

CRA Git | Maintained and supported by SUSTech CRA and CCSE