lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: mostly const a structure

Browse Source 
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: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike
2007-02-10 01:44:06 -08:00
committed by Linus Torvalds
parent 99b0278f95
commit a52f362f86
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,8 +354,7 @@ int console_write_chan(struct list_head *chans, const char *buf, int len)
return ret; return ret;
} }
int console_open_chan(struct line *line, struct console *co, int console_open_chan(struct line *line, struct console *co)
const struct chan_opts *opts)
{ {
int err; int err;
@@ -363,7 +362,7 @@ int console_open_chan(struct line *line, struct console *co,
if(err) if(err)
return err; return err;
printk("Console initialized on /dev/%s%d\n",co->name,co->index); printk("Console initialized on /dev/%s%d\n", co->name, co->index);
return 0; return 0;
} }

3
arch/um/drivers/ssl.c
View File

@@ -38,6 +38,7 @@ static void ssl_announce(char *dev_name, int dev)
dev_name); dev_name);
} }
/* Almost const, except that xterm_title may be changed in an initcall */
static struct chan_opts opts = { static struct chan_opts opts = {
.announce = ssl_announce, .announce = ssl_announce,
.xterm_title = "Serial Line #%d", .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]; 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 = { static struct console ssl_cons = {

3
arch/um/drivers/stdio_console.c
View File

@@ -42,6 +42,7 @@ void stdio_announce(char *dev_name, int dev)
dev_name); dev_name);
} }
/* Almost const, except that xterm_title may be changed in an initcall */
static struct chan_opts opts = { static struct chan_opts opts = {
.announce = stdio_announce, .announce = stdio_announce,
.xterm_title = "Virtual Console #%d", .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]; struct line *line = &vts[co->index];
return console_open_chan(line, co, &opts); return console_open_chan(line, co);
} }
static struct console stdiocons = { static struct console stdiocons = {

3
arch/um/include/chan_kern.h
View File

@@ -36,8 +36,7 @@ extern int write_chan(struct list_head *chans, const char *buf, int len,
int write_irq); int write_irq);
extern int console_write_chan(struct list_head *chans, const char *buf, extern int console_write_chan(struct list_head *chans, const char *buf,
int len); int len);
extern int console_open_chan(struct line *line, struct console *co, extern int console_open_chan(struct line *line, struct console *co);
const struct chan_opts *opts);
extern void deactivate_chan(struct list_head *chans, int irq); extern void deactivate_chan(struct list_head *chans, int irq);
extern void reactivate_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); extern void chan_enable_winch(struct list_head *chans, struct tty_struct *tty);

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

@@ -9,11 +9,11 @@
#include "init.h" #include "init.h"
struct chan_opts { struct chan_opts {
void (*announce)(char *dev_name, int dev); void (*const announce)(char *dev_name, int dev);
char *xterm_title; char *xterm_title;
int raw; const int raw;
unsigned long tramp_stack; const unsigned long tramp_stack;
int in_kernel; const int in_kernel;
}; };
enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE }; enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE };