[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: 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>

3 files changed, 6 insertions, 5 deletions

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index bce9b3427b09..7b8baf146acc 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -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;
 
@@ -363,7 +362,7 @@ int console_open_chan(struct line *line, struct console *co,
         if(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;
 }
 
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index fe400acc9751..475de52783e4 100644
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
@@ -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 = {
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 0b1bca498049..a83c42c263b3 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -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 = {