[PATCH] uml: SIGIO formatting fixes

Fix formatting in the sigio code.

Signed-off-by: Jeff Dike <jdike@addtoit.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>

diff --git a/arch/um/include/sigio.h b/arch/um/include/sigio.h
index fe99ea163c2e68eab0be8e7cecd183132a53e5e1..434f1a9ae4b354621f01d82eb3965cc8645af989 100644 (file)
--- a/arch/um/include/sigio.h
+++ b/arch/um/include/sigio.h
@@ -12,14 +12,3 @@ extern void sigio_lock(void);
 extern void sigio_unlock(void);
 
 #endif
-
-/*
- * 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:
- */

diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c
index 1c831f9ee09f119c21fd01df7e7cfdbc568cb249..89f9866a1354b8073cf5f015bd4b80e276b6e9a4 100644 (file)
--- a/arch/um/kernel/sigio.c
+++ b/arch/um/kernel/sigio.c
@@ -23,7 +23,7 @@ static irqreturn_t sigio_interrupt(int irq, void *data)
 
        os_read_file(sigio_irq_fd, &c, sizeof(c));
        reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
-       return(IRQ_HANDLED);
+       return IRQ_HANDLED;
 }
 
 int write_sigio_irq(int fd)
@@ -36,10 +36,10 @@ int write_sigio_irq(int fd)
        if(err){
                printk("write_sigio_irq : um_request_irq failed, err = %d\n",
                       err);
-               return(-1);
+               return -1;
        }
        sigio_irq_fd = fd;
-       return(0);
+       return 0;
 }
 
 /* These are called from os-Linux/sigio.c to protect its pollfds arrays. */