uml: console subsystem tidying

This does a lot of cleanup on the UML console system.  This patch should be
entirely non-functional.

The tidying is as follows:
	header cleanups - the includes should be closer to minimal and complete
	all printks now have a severity
	lots of style fixes
	fd_close is restructured a little in order to reduce the nesting
	some functions were calling the os_* wrappers when they can
call libc directly
	port_accept had a unnecessary variable
	it also tested a pid unecessarily before killing it
	some functions were made static
	xterm_free is gone, as it was identical to generic_free

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 35 insertions, 39 deletions

diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 39c01ffd45c..207b0444c9d 100644
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -1,17 +1,19 @@
 /* 
- * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
  * Licensed under the GPL
  */
 
-#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <termios.h>
+#include <stdio.h>
 #include <errno.h>
-#include "user.h"
+#include <termios.h>
+#include <unistd.h>
 #include "chan_user.h"
-#include "os.h"
 #include "um_malloc.h"
+#include "user.h"
+#include "os.h"
+#include "kern_constants.h"
 
 struct fd_chan {
         int fd;
@@ -26,22 +28,26 @@ static void *fd_init(char *str, int device, const struct chan_opts *opts)
         char *end;
         int n;
 
-        if(*str != ':'){
-                printk("fd_init : channel type 'fd' must specify a file "
-                       "descriptor\n");
-                return(NULL);
+        if (*str != ':') {
+                printk(UM_KERN_ERR "fd_init : channel type 'fd' must specify a "
+                       "file descriptor\n");
+                return NULL;
         }
         str++;
         n = strtoul(str, &end, 0);
-        if((*end != '\0') || (end == str)){
-                printk("fd_init : couldn't parse file descriptor '%s'\n", str);
-                return(NULL);
+        if ((*end != '\0') || (end == str)) {
+                printk(UM_KERN_ERR "fd_init : couldn't parse file descriptor "
+                       "'%s'\n", str);
+                return NULL;
         }
+
         data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
-        if(data == NULL) return(NULL);
+        if(data == NULL)
+                return NULL;
+
         *data = ((struct fd_chan) { .fd         = n,
                                     .raw        = opts->raw });
-        return(data);
+        return data;
 }
 
 static int fd_open(int input, int output, int primary, void *d, char **dev_out)
@@ -49,18 +55,18 @@ static int fd_open(int input, int output, int primary, void *d, char **dev_out)
         struct fd_chan *data = d;
         int err;
 
-        if(data->raw && isatty(data->fd)){
+        if (data->raw && isatty(data->fd)) {
                 CATCH_EINTR(err = tcgetattr(data->fd, &data->tt));
-                if(err)
-                        return(err);
+                if (err)
+                        return err;
 
                 err = raw(data->fd);
-                if(err)
-                        return(err);
+                if (err)
+                        return err;
         }
         sprintf(data->str, "%d", data->fd);
         *dev_out = data->str;
-        return(data->fd);
+        return data->fd;
 }
 
 static void fd_close(int fd, void *d)
@@ -68,13 +74,14 @@ static void fd_close(int fd, void *d)
         struct fd_chan *data = d;
         int err;
 
-        if(data->raw && isatty(fd)){
-                CATCH_EINTR(err = tcsetattr(fd, TCSAFLUSH, &data->tt));
-                if(err)
-                        printk("Failed to restore terminal state - "
-                               "errno = %d\n", -err);
-                data->raw = 0;
-        }
+        if (!data->raw || !isatty(fd))
+                return;
+
+        CATCH_EINTR(err = tcsetattr(fd, TCSAFLUSH, &data->tt));
+        if (err)
+                printk(UM_KERN_ERR "Failed to restore terminal state - "
+                       "errno = %d\n", -err);
+        data->raw = 0;
 }
 
 const struct chan_ops fd_ops = {
@@ -89,14 +96,3 @@ const struct chan_ops fd_ops = {
         .free           = generic_free,
         .winch          = 1,
 };
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */