diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-01-06 03:18:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:45 -0500 |
commit | d50084a2991f3d9490d5c0f3af72e6fe1515a493 (patch) | |
tree | 051d6c46ddab1ee47db40252cdad4cbbe0a04f5b /arch/um/drivers/ssl.c | |
parent | 1b57e9c27882a908f180d4daf72ee12c6f137178 (diff) |
[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>
Diffstat (limited to 'arch/um/drivers/ssl.c')
-rw-r--r-- | arch/um/drivers/ssl.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index 62e04ecfada8..95a3eaa7163c 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c | |||
@@ -69,7 +69,7 @@ static struct line_driver driver = { | |||
69 | .name = "ssl", | 69 | .name = "ssl", |
70 | .config = ssl_config, | 70 | .config = ssl_config, |
71 | .get_config = ssl_get_config, | 71 | .get_config = ssl_get_config, |
72 | .id = line_id, | 72 | .id = line_id, |
73 | .remove = ssl_remove, | 73 | .remove = ssl_remove, |
74 | }, | 74 | }, |
75 | }; | 75 | }; |
@@ -84,21 +84,21 @@ static struct lines lines = LINES_INIT(NR_PORTS); | |||
84 | 84 | ||
85 | static int ssl_config(char *str) | 85 | static int ssl_config(char *str) |
86 | { | 86 | { |
87 | return(line_config(serial_lines, | 87 | return line_config(serial_lines, |
88 | sizeof(serial_lines)/sizeof(serial_lines[0]), str)); | 88 | sizeof(serial_lines)/sizeof(serial_lines[0]), str); |
89 | } | 89 | } |
90 | 90 | ||
91 | static int ssl_get_config(char *dev, char *str, int size, char **error_out) | 91 | static int ssl_get_config(char *dev, char *str, int size, char **error_out) |
92 | { | 92 | { |
93 | return(line_get_config(dev, serial_lines, | 93 | return line_get_config(dev, serial_lines, |
94 | sizeof(serial_lines)/sizeof(serial_lines[0]), | 94 | sizeof(serial_lines)/sizeof(serial_lines[0]), |
95 | str, size, error_out)); | 95 | str, size, error_out); |
96 | } | 96 | } |
97 | 97 | ||
98 | static int ssl_remove(int n) | 98 | static int ssl_remove(int n) |
99 | { | 99 | { |
100 | return line_remove(serial_lines, | 100 | return line_remove(serial_lines, |
101 | sizeof(serial_lines)/sizeof(serial_lines[0]), n); | 101 | sizeof(serial_lines)/sizeof(serial_lines[0]), n); |
102 | } | 102 | } |
103 | 103 | ||
104 | int ssl_open(struct tty_struct *tty, struct file *filp) | 104 | int ssl_open(struct tty_struct *tty, struct file *filp) |
@@ -183,7 +183,7 @@ static int ssl_console_setup(struct console *co, char *options) | |||
183 | { | 183 | { |
184 | struct line *line = &serial_lines[co->index]; | 184 | struct line *line = &serial_lines[co->index]; |
185 | 185 | ||
186 | return console_open_chan(line,co,&opts); | 186 | return console_open_chan(line, co, &opts); |
187 | } | 187 | } |
188 | 188 | ||
189 | static struct console ssl_cons = { | 189 | static struct console ssl_cons = { |
@@ -199,10 +199,11 @@ int ssl_init(void) | |||
199 | { | 199 | { |
200 | char *new_title; | 200 | char *new_title; |
201 | 201 | ||
202 | printk(KERN_INFO "Initializing software serial port version %d\n", | 202 | printk(KERN_INFO "Initializing software serial port version %d\n", |
203 | ssl_version); | 203 | ssl_version); |
204 | ssl_driver = line_register_devfs(&lines, &driver, &ssl_ops, | 204 | ssl_driver = line_register_devfs(&lines, &driver, &ssl_ops, |
205 | serial_lines, ARRAY_SIZE(serial_lines)); | 205 | serial_lines, |
206 | ARRAY_SIZE(serial_lines)); | ||
206 | 207 | ||
207 | lines_init(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0])); | 208 | lines_init(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0])); |
208 | 209 | ||
@@ -212,7 +213,7 @@ int ssl_init(void) | |||
212 | 213 | ||
213 | ssl_init_done = 1; | 214 | ssl_init_done = 1; |
214 | register_console(&ssl_cons); | 215 | register_console(&ssl_cons); |
215 | return(0); | 216 | return 0; |
216 | } | 217 | } |
217 | late_initcall(ssl_init); | 218 | late_initcall(ssl_init); |
218 | 219 | ||
@@ -227,9 +228,9 @@ __uml_exitcall(ssl_exit); | |||
227 | 228 | ||
228 | static int ssl_chan_setup(char *str) | 229 | static int ssl_chan_setup(char *str) |
229 | { | 230 | { |
230 | return(line_setup(serial_lines, | 231 | return line_setup(serial_lines, |
231 | sizeof(serial_lines)/sizeof(serial_lines[0]), | 232 | sizeof(serial_lines)/sizeof(serial_lines[0]), |
232 | str, 1)); | 233 | str, 1); |
233 | } | 234 | } |
234 | 235 | ||
235 | __setup("ssl", ssl_chan_setup); | 236 | __setup("ssl", ssl_chan_setup); |