[PATCH 7/8] UML - port driver formatting

Previous thread: [PATCH 4/8] UML - audio driver formatting by Jeff Dike on Monday, January 1, 2007 - 3:47 pm. (4 messages)

Next thread: [PATCH 8/8] UML - Kill a compilation warning by Jeff Dike on Monday, January 1, 2007 - 3:47 pm. (1 message)
To: <akpm@...>
Cc: <linux-kernel@...>, <user-mode-linux-devel@...>
Date: Monday, January 1, 2007 - 3:47 pm

Whitespace and style fixes.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
--
arch/um/drivers/port_kern.c | 46 +++++++++++++++++++--------------------
arch/um/drivers/port_user.c | 51 +++++++++++++++++---------------------------
2 files changed, 43 insertions(+), 54 deletions(-)

Index: linux-2.6.18-mm/arch/um/drivers/port_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/port_kern.c 2007-01-01 13:28:27.000000000 -0500
+++ linux-2.6.18-mm/arch/um/drivers/port_kern.c 2007-01-01 13:29:38.000000000 -0500
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
@@ -55,9 +55,9 @@ static irqreturn_t pipe_interrupt(int ir
fd = os_rcv_fd(conn->socket[0], &conn->helper_pid);
if(fd < 0){
if(fd == -EAGAIN)
- return(IRQ_NONE);
+ return IRQ_NONE;

- printk(KERN_ERR "pipe_interrupt : os_rcv_fd returned %d\n",
+ printk(KERN_ERR "pipe_interrupt : os_rcv_fd returned %d\n",
-fd);
os_close_file(conn->fd);
}
@@ -68,7 +68,7 @@ static irqreturn_t pipe_interrupt(int ir
list_add(&conn->list, &conn->port->connections);

complete(&conn->port->done);
- return(IRQ_HANDLED);
+ return IRQ_HANDLED;
}

#define NO_WAITER_MSG \
@@ -97,14 +97,14 @@ static int port_accept(struct port_list
"connection\n");
goto out_close;
}
- *conn = ((struct connection)
+ *conn = ((struct connection)
{ .list = LIST_HEAD_INIT(conn->list),
.fd = fd,
.socket = { socket[0], socket[1] },
.telnetd_pid = pid,
.port = port });

- if(um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt,
+ if(um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt,
IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
"telnetd", conn)){
printk(KERN_ERR "port_accept : failed to get IRQ for "
@@ -117,17 +117,17 @@ static int port_accept(struct p...

Previous thread: [PATCH 4/8] UML - audio driver formatting by Jeff Dike on Monday, January 1, 2007 - 3:47 pm. (4 messages)

Next thread: [PATCH 8/8] UML - Kill a compilation warning by Jeff Dike on Monday, January 1, 2007 - 3:47 pm. (1 message)