2007-02-07 19:55:41

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 3/7] UML - SIGIO formatting fixes

Fix formatting in the sigio code.

Signed-off-by: Jeff Dike <[email protected]>
--
arch/um/include/sigio.h | 11 -----------
arch/um/kernel/sigio.c | 6 +++---
2 files changed, 3 insertions(+), 14 deletions(-)

Index: linux-2.6.18-mm/arch/um/include/sigio.h
===================================================================
--- linux-2.6.18-mm.orig/arch/um/include/sigio.h 2006-06-17 21:49:35.000000000 -0400
+++ linux-2.6.18-mm/arch/um/include/sigio.h 2007-01-09 15:16:29.000000000 -0500
@@ -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:
- */
Index: linux-2.6.18-mm/arch/um/kernel/sigio.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/kernel/sigio.c 2007-01-09 15:12:08.000000000 -0500
+++ linux-2.6.18-mm/arch/um/kernel/sigio.c 2007-01-09 15:15:59.000000000 -0500
@@ -23,7 +23,7 @@ static irqreturn_t sigio_interrupt(int i

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. */