aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/fd.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 04:27:34 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:09 -0400
commitcb8fa61c2b8b29d422d7310f064d60022f18f89b (patch)
treef5c8ac78b109e6c76e05250d19fd75e28c47dc74 /arch/um/drivers/fd.c
parent54ae36f24b103e521dd683f66fe72b0584ccb7e2 (diff)
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/fd.c')
-rw-r--r--arch/um/drivers/fd.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 207b0444c9d9..0a2bb5b64b82 100644
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -1,19 +1,18 @@
1/* 1/*
2 * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com) 2 * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#include <stddef.h>
7#include <stdlib.h>
8#include <stdio.h> 6#include <stdio.h>
7#include <stdlib.h>
8#include <unistd.h>
9#include <errno.h> 9#include <errno.h>
10#include <termios.h> 10#include <termios.h>
11#include <unistd.h>
12#include "chan_user.h" 11#include "chan_user.h"
12#include "kern_constants.h"
13#include "os.h"
13#include "um_malloc.h" 14#include "um_malloc.h"
14#include "user.h" 15#include "user.h"
15#include "os.h"
16#include "kern_constants.h"
17 16
18struct fd_chan { 17struct fd_chan {
19 int fd; 18 int fd;
@@ -42,7 +41,7 @@ static void *fd_init(char *str, int device, const struct chan_opts *opts)
42 } 41 }
43 42
44 data = kmalloc(sizeof(*data), UM_GFP_KERNEL); 43 data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
45 if(data == NULL) 44 if (data == NULL)
46 return NULL; 45 return NULL;
47 46
48 *data = ((struct fd_chan) { .fd = n, 47 *data = ((struct fd_chan) { .fd = n,