Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / um / drivers / tty.c

diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
index 94c9265a4f2ca54e034f4f79c11bf48ee061bdf2..c07d0d56278029ea8ed040c6cc5b17ce4e520723 100644 (file)
--- a/arch/um/drivers/tty.c
+++ b/arch/um/drivers/tty.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
  * Licensed under the GPL
  */
@@ -8,9 +8,9 @@
 #include <errno.h>
 #include <unistd.h>
 #include "chan_user.h"
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
+#include "um_malloc.h"
 
 struct tty_chan {
        char *dev;
@@ -18,24 +18,24 @@ struct tty_chan {
        struct termios tt;
 };
 
-static void *tty_chan_init(char *str, int device, struct chan_opts *opts)
+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 "
                       "a device\n");
-               return(NULL);
+               return NULL;
        }
        str++;
 
        data = um_kmalloc(sizeof(*data));
        if(data == NULL)
-               return(NULL);
+               return NULL;
        *data = ((struct tty_chan) { .dev       = str,
                                     .raw       = opts->raw });
-                                    
-       return(data);
+
+       return data;
 }
 
 static int tty_open(int input, int output, int primary, void *d,
@@ -45,22 +45,24 @@ static int tty_open(int input, int output, int primary, void *d,
        int fd, err;
 
        fd = os_open_file(data->dev, of_set_rw(OPENFLAGS(), input, output), 0);
-       if(fd < 0) return(fd);
+       if(fd < 0)
+               return fd;
+
        if(data->raw){
                CATCH_EINTR(err = tcgetattr(fd, &data->tt));
                if(err)
-                       return(err);
+                       return err;
 
                err = raw(fd);
                if(err)
-                       return(err);
+                       return err;
        }
 
        *dev_out = data->dev;
-       return(fd);
+       return fd;
 }
 
-struct chan_ops tty_ops = {
+const struct chan_ops tty_ops = {
        .type           = "tty",
        .init           = tty_chan_init,
        .open           = tty_open,
@@ -72,14 +74,3 @@ struct chan_ops tty_ops = {
        .free           = generic_free,
        .winch          = 0,
 };
-
-/*
- * 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:
- */