[PATCH] uml: formatting fixes

Fix a bunch of formatting problems.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 33 insertions, 37 deletions

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 0a7786e00cfb..8cd851be0e4d 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -22,13 +22,14 @@ int tap_open_common(void *dev, char *gate_addr)
 {
         int tap_addr[4];
 
-        if(gate_addr == NULL) return(0);
+        if(gate_addr == NULL)
+                return 0;
         if(sscanf(gate_addr, "%d.%d.%d.%d", &tap_addr[0], 
                   &tap_addr[1], &tap_addr[2], &tap_addr[3]) != 4){
                 printk("Invalid tap IP address - '%s'\n", gate_addr);
-                return(-EINVAL);
+                return -EINVAL;
         }
-        return(0);
+        return 0;
 }
 
 void tap_check_ips(char *gate_addr, unsigned char *eth_addr)
@@ -94,10 +95,10 @@ int net_read(int fd, void *buf, int len)
         n = os_read_file(fd,  buf,  len);
 
         if(n == -EAGAIN)
-                return(0);
+                return 0;
         else if(n == 0)
-                return(-ENOTCONN);
-        return(n);
+                return -ENOTCONN;
+        return n;
 }
 
 int net_recvfrom(int fd, void *buf, int len)
@@ -108,11 +109,13 @@ int net_recvfrom(int fd, void *buf, int len)
               (errno == EINTR)) ;
 
         if(n < 0){
-                if(errno == EAGAIN) return(0);
-                return(-errno);
+                if(errno == EAGAIN)
+                        return 0;
+                return -errno;
         }
-        else if(n == 0) return(-ENOTCONN);
-        return(n);
+        else if(n == 0)
+                return -ENOTCONN;
+        return n;
 }
 
 int net_write(int fd, void *buf, int len)
@@ -122,10 +125,10 @@ int net_write(int fd, void *buf, int len)
         n = os_write_file(fd, buf, len);
 
         if(n == -EAGAIN)
-                return(0);
+                return 0;
         else if(n == 0)
-                return(-ENOTCONN);
-        return(n);
+                return -ENOTCONN;
+        return n;
 }
 
 int net_send(int fd, void *buf, int len)
@@ -134,11 +137,13 @@ int net_send(int fd, void *buf, int len)
 
         while(((n = send(fd, buf, len, 0)) < 0) && (errno == EINTR)) ;
         if(n < 0){
-                if(errno == EAGAIN) return(0);
-                return(-errno);
+                if(errno == EAGAIN)
+                        return 0;
+                return -errno;
         }
-        else if(n == 0) return(-ENOTCONN);
-        return(n);      
+        else if(n == 0)
+                return -ENOTCONN;
+        return n;
 }
 
 int net_sendto(int fd, void *buf, int len, void *to, int sock_len)
@@ -148,11 +153,13 @@ int net_sendto(int fd, void *buf, int len, void *to, int sock_len)
         while(((n = sendto(fd, buf, len, 0, (struct sockaddr *) to,
                            sock_len)) < 0) && (errno == EINTR)) ;
         if(n < 0){
-                if(errno == EAGAIN) return(0);
-                return(-errno);
+                if(errno == EAGAIN)
+                        return 0;
+                return -errno;
         }
-        else if(n == 0) return(-ENOTCONN);
-        return(n);      
+        else if(n == 0)
+                return -ENOTCONN;
+        return n;
 }
 
 struct change_pre_exec_data {
@@ -176,7 +183,7 @@ static int change_tramp(char **argv, char *output, int output_len)
         err = os_pipe(fds, 1, 0);
         if(err < 0){
                 printk("change_tramp - pipe failed, err = %d\n", -err);
-                return(err);
+                return err;
         }
         pe_data.close_me = fds[0];
         pe_data.stdout = fds[1];
@@ -190,7 +197,7 @@ static int change_tramp(char **argv, char *output, int output_len)
 
         if (pid > 0)
                 CATCH_EINTR(err = waitpid(pid, NULL, 0));
-        return(pid);
+        return pid;
 }
 
 static void change(char *dev, char *what, unsigned char *addr,
@@ -241,26 +248,15 @@ char *split_if_spec(char *str, ...)
         va_start(ap, str);
         while((arg = va_arg(ap, char **)) != NULL){
                 if(*str == '\0')
-                        return(NULL);
+                        return NULL;
                 end = strchr(str, ',');
                 if(end != str)
                         *arg = str;
                 if(end == NULL)
-                        return(NULL);
+                        return NULL;
                 *end++ = '\0';
                 str = end;
         }
         va_end(ap);
-        return(str);
+        return str;
 }
-
-/*
- * 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:
- */