uml: driver formatting fixes

Fix a bunch of formatting violations in the drivers:
	return(n) -> return n
	whitespace fixes
	emacs formatting comment removal
	breaking if(foo) return(n) into two lines

There are also a couple of errno use bugs:
	using errno in a printk when the failure put errno into a local variable
	saving errno after a printk, which can change it

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

1 files changed, 11 insertions, 22 deletions

diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c
index 11921a7baa7b..a1747dc0ff6f 100644
--- a/arch/um/drivers/pcap_user.c
+++ b/arch/um/drivers/pcap_user.c
@@ -42,39 +42,39 @@ static int pcap_open(void *data)
         int err;
 
         if(pri->pcap == NULL)
-                return(-ENODEV);
+                return -ENODEV;
 
         if(pri->filter != NULL){
                 err = dev_netmask(pri->dev, &netmask);
                 if(err < 0){
                         printk("pcap_open : dev_netmask failed\n");
-                        return(-EIO);
+                        return -EIO;
                 }
 
                 pri->compiled = um_kmalloc(sizeof(struct bpf_program));
                 if(pri->compiled == NULL){
                         printk("pcap_open : kmalloc failed\n");
-                        return(-ENOMEM);
+                        return -ENOMEM;
                 }
-                
+
                 err = pcap_compile(pri->pcap, 
                                    (struct bpf_program *) pri->compiled, 
                                    pri->filter, pri->optimize, netmask);
                 if(err < 0){
                         printk("pcap_open : pcap_compile failed - '%s'\n", 
                                pcap_geterr(pri->pcap));
-                        return(-EIO);
+                        return -EIO;
                 }
 
                 err = pcap_setfilter(pri->pcap, pri->compiled);
                 if(err < 0){
                         printk("pcap_open : pcap_setfilter failed - '%s'\n", 
                                pcap_geterr(pri->pcap));
-                        return(-EIO);
+                        return -EIO;
                 }
         }
-        
-        return(PCAP_FD(pri->pcap));
+
+        return PCAP_FD(pri->pcap);
 }
 
 static void pcap_remove(void *data)
@@ -114,11 +114,11 @@ int pcap_user_read(int fd, void *buffer, int len, struct pcap_data *pri)
         n = pcap_dispatch(pri->pcap, 1, handler, (u_char *) &hdata);
         if(n < 0){
                 printk("pcap_dispatch failed - %s\n", pcap_geterr(pri->pcap));
-                return(-EIO);
+                return -EIO;
         }
         else if(n == 0) 
-                return(0);
-        return(hdata.len);
+                return 0;
+        return hdata.len;
 }
 
 const struct net_user_info pcap_user_info = {
@@ -131,14 +131,3 @@ const struct net_user_info pcap_user_info = {
         .delete_address = NULL,
         .max_packet     = MAX_PACKET - ETH_HEADER_OTHER
 };
-
-/*
- * 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:
- */