- patches.kernel.org/patch-2.6.24-rc2: Official patch.

[linux-flexiantxendom0-3.2.10.git] / arch / um / drivers / fd.c

diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 39c01ff..0a2bb5b 100644 (file)
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -1,17 +1,18 @@
-/* 
- * 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 <stdlib.h>
 #include <unistd.h>
-#include <termios.h>
 #include <errno.h>
-#include "user.h"
+#include <termios.h>
 #include "chan_user.h"
+#include "kern_constants.h"
 #include "os.h"
 #include "um_malloc.h"
+#include "user.h"
 
 struct fd_chan {
        int fd;
@@ -26,22 +27,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 +54,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 +73,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 +95,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:
- */