Merge branch 'linus' into tracing/mmiotrace-mergefixups

[linux-2.6-omap-h63xx.git] / arch / um / drivers / xterm_kern.c

diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index a4ce7058e10e7c360fd0f72f049d6183530dc4eb..b646bccef37aa8586fb95701a6c750d1246aa8c3 100644 (file)
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -1,18 +1,14 @@
 /* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/errno.h"
-#include "linux/slab.h"
-#include "linux/signal.h"
-#include "linux/interrupt.h"
-#include "asm/irq.h"
-#include "irq_user.h"
+#include <linux/slab.h>
+#include <linux/completion.h>
+#include <linux/irqreturn.h>
+#include <asm/irq.h>
 #include "irq_kern.h"
-#include "kern_util.h"
 #include "os.h"
-#include "xterm.h"
 
 struct xterm_wait {
        struct completion ready;
@@ -27,12 +23,13 @@ static irqreturn_t xterm_interrupt(int irq, void *data)
        int fd;
 
        fd = os_rcv_fd(xterm->fd, &xterm->pid);
-       if(fd == -EAGAIN)
-               return(IRQ_NONE);
+       if (fd == -EAGAIN)
+               return IRQ_NONE;
 
        xterm->new_fd = fd;
        complete(&xterm->ready);
-       return(IRQ_HANDLED);
+
+       return IRQ_HANDLED;
 }
 
 int xterm_fd(int socket, int *pid_out)
@@ -41,22 +38,21 @@ int xterm_fd(int socket, int *pid_out)
        int err, ret;
 
        data = kmalloc(sizeof(*data), GFP_KERNEL);
-       if(data == NULL){
+       if (data == NULL) {
                printk(KERN_ERR "xterm_fd : failed to allocate xterm_wait\n");
-               return(-ENOMEM);
+               return -ENOMEM;
        }
 
        /* This is a locked semaphore... */
-       *data = ((struct xterm_wait) 
-               { .fd           = socket,
-                 .pid          = -1,
-                 .new_fd       = -1 });
+       *data = ((struct xterm_wait) { .fd              = socket,
+                                      .pid             = -1,
+                                      .new_fd          = -1 });
        init_completion(&data->ready);
 
-       err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt, 
+       err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
                             IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                             "xterm", data);
-       if (err){
+       if (err) {
                printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
                       "err = %d\n",  err);
                ret = err;
@@ -76,16 +72,5 @@ int xterm_fd(int socket, int *pid_out)
  out:
        kfree(data);
 
-       return(ret);
+       return ret;
 }
-
-/*
- * 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:
- */