diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 12:27:34 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 20:43:09 +0400 |
| commit | cb8fa61c2b8b29d422d7310f064d60022f18f89b (patch) | |
| tree | f5c8ac78b109e6c76e05250d19fd75e28c47dc74 /arch/um/drivers/pty.c | |
| parent | 54ae36f24b103e521dd683f66fe72b0584ccb7e2 (diff) | |
| download | linux-cb8fa61c2b8b29d422d7310f064d60022f18f89b.tar.xz | |
uml: arch/um/drivers formatting
Style fixes for the rest of the drivers. arch/um/drivers should be pretty
CodingStyle-compliant now.
Except for the ubd driver, which will have to be treated separately.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers/pty.c')
| -rw-r--r-- | arch/um/drivers/pty.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c index 4123fe1fca98..49c79dda6046 100644 --- a/arch/um/drivers/pty.c +++ b/arch/um/drivers/pty.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) * Licensed under the GPL */ @@ -6,16 +6,16 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <string.h> -#include <fcntl.h> #include <errno.h> +#include <fcntl.h> +#include <string.h> #include <termios.h> #include <sys/stat.h> #include "chan_user.h" -#include "os.h" -#include "user.h" #include "kern_constants.h" +#include "os.h" #include "um_malloc.h" +#include "user.h" struct pty_chan { void (*announce)(char *dev_name, int dev); @@ -33,7 +33,7 @@ static void *pty_chan_init(char *str, int device, const struct chan_opts *opts) if (data == NULL) return NULL; - *data = ((struct pty_chan) { .announce = opts->announce, + *data = ((struct pty_chan) { .announce = opts->announce, .dev = device, .raw = opts->raw }); return data; @@ -101,7 +101,7 @@ static int getmaster(char *line) *tp = 't'; err = access(line, R_OK | W_OK); *tp = 'p'; - if(!err) + if (!err) return master; close(master); } @@ -130,7 +130,7 @@ static int pty_open(int input, int output, int primary, void *d, return err; } } - + if (data->announce) (*data->announce)(dev, data->dev); |