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, 22 insertions, 15 deletions

diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
index a9f87e19c5bf..c930fedc5172 100644
--- a/arch/um/drivers/tty.c
+++ b/arch/um/drivers/tty.c
@@ -1,16 +1,16 @@
 /*
- * 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 <termios.h>
 #include <errno.h>
-#include <unistd.h>
+#include <fcntl.h>
+#include <termios.h>
 #include "chan_user.h"
-#include "user.h"
+#include "kern_constants.h"
 #include "os.h"
 #include "um_malloc.h"
+#include "user.h"
 
 struct tty_chan {
         char *dev;
@@ -22,15 +22,15 @@ static void *tty_chan_init(char *str, int device, const struct chan_opts *opts)
 {
         struct tty_chan *data;
 
-        if(*str != ':'){
-                printk("tty_init : channel type 'tty' must specify "
+        if (*str != ':') {
+                printk(UM_KERN_ERR "tty_init : channel type 'tty' must specify "
                        "a device\n");
                 return NULL;
         }
         str++;
 
         data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
-        if(data == NULL)
+        if (data == NULL)
                 return NULL;
         *data = ((struct tty_chan) { .dev       = str,
                                      .raw       = opts->raw });
@@ -42,19 +42,26 @@ static int tty_open(int input, int output, int primary, void *d,
                     char **dev_out)
 {
         struct tty_chan *data = d;
-        int fd, err;
+        int fd, err, mode = 0;
+
+        if (input && output)
+                mode = O_RDWR;
+        else if (input)
+                mode = O_RDONLY;
+        else if (output)
+                mode = O_WRONLY;
 
-        fd = os_open_file(data->dev, of_set_rw(OPENFLAGS(), input, output), 0);
-        if(fd < 0)
-                return fd;
+        fd = open(data->dev, mode);
+        if (fd < 0)
+                return -errno;
 
-        if(data->raw){
+        if (data->raw) {
                 CATCH_EINTR(err = tcgetattr(fd, &data->tt));
-                if(err)
+                if (err)
                         return err;
 
                 err = raw(fd);
-                if(err)
+                if (err)
                         return err;
         }