spelling fixes: arch/um/

[linux-2.6.git] / arch / um / drivers / null.c

diff --git a/arch/um/drivers/null.c b/arch/um/drivers/null.c
index 3683ed44315d6e2da21707c9293bf82eb22e326b..2b45a1446c86b5bf34f01cfe9d71d19ec1a118cc 100644 (file)
--- a/arch/um/drivers/null.c
+++ b/arch/um/drivers/null.c
@@ -1,30 +1,36 @@
-/* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+/*
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
  * Licensed under the GPL
  */
 
-#include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
+#include <fcntl.h>
 #include "chan_user.h"
 #include "os.h"
 
+/* This address is used only as a unique identifier */
 static int null_chan;
 
 static void *null_init(char *str, int device, const struct chan_opts *opts)
 {
-       return(&null_chan);
+       return &null_chan;
 }
 
 static int null_open(int input, int output, int primary, void *d,
                     char **dev_out)
 {
+       int fd;
+
        *dev_out = NULL;
-       return(os_open_file(DEV_NULL, of_rdwr(OPENFLAGS()), 0));
+
+       fd = open(DEV_NULL, O_RDWR);
+       return (fd < 0) ? -errno : fd;
 }
 
 static int null_read(int fd, char *c_out, void *unused)
 {
-       return(-ENODEV);
+       return -ENODEV;
 }
 
 static void null_free(void *data)
@@ -43,14 +49,3 @@ const struct chan_ops null_ops = {
        .free           = null_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:
- */