[PATCH] uml: Formatting changes

This patch makes a bunch of non-functional changes -
    return(foo); becomes return foo;
    some statements are broken across lines for readability
    some trailing whitespace is cleaned up
    open_one_chan took four arguments, three of which could be
       deduced from the first.  Accordingly, they were eliminated.
    some examples of "} else {" had a newline added
    some whitespace cleanup in the indentation
    lines_init got some control flow cleanup
    some long lines were broken
    removed another emacs-specific C formatting comment

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike
2006-01-06 00:18:50 -08:00
committed by Linus Torvalds
parent 1b57e9c278
commit d50084a299
8 changed files with 358 additions and 345 deletions

View File

@ -75,7 +75,7 @@ static struct line_driver driver = {
.name = "con",
.config = con_config,
.get_config = con_get_config,
.id = line_id,
.id = line_id,
.remove = con_remove,
},
};
@ -86,23 +86,23 @@ static struct lines console_lines = LINES_INIT(MAX_TTYS);
* individual elements are protected by individual semaphores.
*/
struct line vts[MAX_TTYS] = { LINE_INIT(CONFIG_CON_ZERO_CHAN, &driver),
[ 1 ... MAX_TTYS - 1 ] =
[ 1 ... MAX_TTYS - 1 ] =
LINE_INIT(CONFIG_CON_CHAN, &driver) };
static int con_config(char *str)
{
return(line_config(vts, sizeof(vts)/sizeof(vts[0]), str));
return line_config(vts, sizeof(vts)/sizeof(vts[0]), str);
}
static int con_get_config(char *dev, char *str, int size, char **error_out)
{
return(line_get_config(dev, vts, sizeof(vts)/sizeof(vts[0]), str,
size, error_out));
return line_get_config(dev, vts, sizeof(vts)/sizeof(vts[0]), str,
size, error_out);
}
static int con_remove(int n)
{
return line_remove(vts, sizeof(vts)/sizeof(vts[0]), n);
return line_remove(vts, sizeof(vts)/sizeof(vts[0]), n);
}
static int con_open(struct tty_struct *tty, struct file *filp)
@ -117,7 +117,7 @@ static struct tty_operations console_ops = {
.close = line_close,
.write = line_write,
.put_char = line_put_char,
.write_room = line_write_room,
.write_room = line_write_room,
.chars_in_buffer = line_chars_in_buffer,
.flush_buffer = line_flush_buffer,
.flush_chars = line_flush_chars,
@ -126,7 +126,7 @@ static struct tty_operations console_ops = {
};
static void uml_console_write(struct console *console, const char *string,
unsigned len)
unsigned len)
{
struct line *line = &vts[console->index];
unsigned long flags;
@ -146,7 +146,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, &opts);
}
static struct console stdiocons = {
@ -156,7 +156,7 @@ static struct console stdiocons = {
.setup = uml_console_setup,
.flags = CON_PRINTBUFFER,
.index = -1,
.data = &vts,
.data = &vts,
};
int stdio_init(void)
@ -166,7 +166,7 @@ int stdio_init(void)
console_driver = line_register_devfs(&console_lines, &driver,
&console_ops, vts,
ARRAY_SIZE(vts));
if (NULL == console_driver)
if (console_driver == NULL)
return -1;
printk(KERN_INFO "Initialized stdio console driver\n");
@ -178,7 +178,7 @@ int stdio_init(void)
con_init_done = 1;
register_console(&stdiocons);
return(0);
return 0;
}
late_initcall(stdio_init);
@ -192,7 +192,7 @@ __uml_exitcall(console_exit);
static int console_chan_setup(char *str)
{
return(line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1));
return line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1);
}
__setup("con", console_chan_setup);
__channel_help(console_chan_setup, "con");