aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include/line.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-01-06 03:18:50 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 11:33:45 -0500
commitd50084a2991f3d9490d5c0f3af72e6fe1515a493 (patch)
tree051d6c46ddab1ee47db40252cdad4cbbe0a04f5b /arch/um/include/line.h
parent1b57e9c27882a908f180d4daf72ee12c6f137178 (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/include/line.h')
-rw-r--r--arch/um/include/line.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/arch/um/include/line.h b/arch/um/include/line.h
index 5323d22a6ca7..315788ce59fa 100644
--- a/arch/um/include/line.h
+++ b/arch/um/include/line.h
@@ -64,8 +64,8 @@ struct line {
64 head : NULL, \ 64 head : NULL, \
65 tail : NULL, \ 65 tail : NULL, \
66 sigio : 0, \ 66 sigio : 0, \
67 driver : d, \ 67 driver : d, \
68 have_irq : 0 } 68 have_irq : 0 }
69 69
70struct lines { 70struct lines {
71 int num; 71 int num;
@@ -74,11 +74,12 @@ struct lines {
74#define LINES_INIT(n) { num : n } 74#define LINES_INIT(n) { num : n }
75 75
76extern void line_close(struct tty_struct *tty, struct file * filp); 76extern void line_close(struct tty_struct *tty, struct file * filp);
77extern int line_open(struct line *lines, struct tty_struct *tty, 77extern int line_open(struct line *lines, struct tty_struct *tty,
78 struct chan_opts *opts); 78 struct chan_opts *opts);
79extern int line_setup(struct line *lines, unsigned int sizeof_lines, char *init, 79extern int line_setup(struct line *lines, unsigned int sizeof_lines, char *init,
80 int all_allowed); 80 int all_allowed);
81extern int line_write(struct tty_struct *tty, const unsigned char *buf, int len); 81extern int line_write(struct tty_struct *tty, const unsigned char *buf,
82 int len);
82extern void line_put_char(struct tty_struct *tty, unsigned char ch); 83extern void line_put_char(struct tty_struct *tty, unsigned char ch);
83extern void line_set_termios(struct tty_struct *tty, struct termios * old); 84extern void line_set_termios(struct tty_struct *tty, struct termios * old);
84extern int line_chars_in_buffer(struct tty_struct *tty); 85extern int line_chars_in_buffer(struct tty_struct *tty);
@@ -89,21 +90,24 @@ extern int line_ioctl(struct tty_struct *tty, struct file * file,
89 unsigned int cmd, unsigned long arg); 90 unsigned int cmd, unsigned long arg);
90 91
91extern char *add_xterm_umid(char *base); 92extern char *add_xterm_umid(char *base);
92extern int line_setup_irq(int fd, int input, int output, struct tty_struct *tty); 93extern int line_setup_irq(int fd, int input, int output,
94 struct tty_struct *tty);
93extern void line_close_chan(struct line *line); 95extern void line_close_chan(struct line *line);
94extern void line_disable(struct tty_struct *tty, int current_irq); 96extern void line_disable(struct tty_struct *tty, int current_irq);
95extern struct tty_driver * line_register_devfs(struct lines *set, 97extern struct tty_driver * line_register_devfs(struct lines *set,
96 struct line_driver *line_driver, 98 struct line_driver *line_driver,
97 struct tty_operations *driver, 99 struct tty_operations *driver,
98 struct line *lines, 100 struct line *lines,
99 int nlines); 101 int nlines);
100extern void lines_init(struct line *lines, int nlines); 102extern void lines_init(struct line *lines, int nlines);
101extern void close_lines(struct line *lines, int nlines); 103extern void close_lines(struct line *lines, int nlines);
102 104
103extern int line_config(struct line *lines, unsigned int sizeof_lines, char *str); 105extern int line_config(struct line *lines, unsigned int sizeof_lines,
106 char *str);
104extern int line_id(char **str, int *start_out, int *end_out); 107extern int line_id(char **str, int *start_out, int *end_out);
105extern int line_remove(struct line *lines, unsigned int sizeof_lines, int n); 108extern int line_remove(struct line *lines, unsigned int sizeof_lines, int n);
106extern int line_get_config(char *dev, struct line *lines, unsigned int sizeof_lines, char *str, 109extern int line_get_config(char *dev, struct line *lines,
110 unsigned int sizeof_lines, char *str,
107 int size, char **error_out); 111 int size, char **error_out);
108 112
109#endif 113#endif