staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IX

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 352 insertions, 366 deletions

diff --git a/drivers/staging/rtl8192e/rtl_debug.c b/drivers/staging/rtl8192e/rtl_debug.c
index 5c2d01c..22bc2dd 100644
--- a/drivers/staging/rtl8192e/rtl_debug.c
+++ b/drivers/staging/rtl8192e/rtl_debug.c
@@ -53,12 +53,10 @@ u32	DBGP_Type[DBGP_TYPE_MAX];
  *---------------------------------------------------------------------------*/
 void	rtl8192_dbgp_flag_init(struct net_device *dev)
 {
-    u8	i;
+	u8 i;
 
 	for (i = 0; i < DBGP_TYPE_MAX; i++)
-	{
 		DBGP_Type[i] = 0;
-	}
 
 
 }	/* DBGP_Flag_Init */
@@ -67,19 +65,19 @@ void	rtl8192_dbgp_flag_init(struct net_device *dev)
 void print_buffer(u32 *buffer, int len)
 {
 	int i;
-	u8 *buf =(u8*)buffer;
+	u8 *buf = (u8 *)buffer;
 
-	printk("ASCII BUFFER DUMP (len: %x):\n",len);
+	printk(KERN_INFO "ASCII BUFFER DUMP (len: %x):\n", len);
 
-	for (i=0;i<len;i++)
-		printk("%c",buf[i]);
+	for (i = 0; i < len; i++)
+		printk(KERN_INFO "%c", buf[i]);
 
-	printk("\nBINARY BUFFER DUMP (len: %x):\n",len);
+	printk(KERN_INFO "\nBINARY BUFFER DUMP (len: %x):\n", len);
 
-	for (i=0;i<len;i++)
-		printk("%x",buf[i]);
+	for (i = 0; i < len; i++)
+		printk(KERN_INFO "%x", buf[i]);
 
-	printk("\n");
+	printk(KERN_INFO "\n");
 }
 
 /* this is only for debug */
@@ -87,9 +85,9 @@ void dump_eprom(struct net_device *dev)
 {
 	int i;
 
-	for (i = 0; i < 0xff; i++) {
-		RT_TRACE(COMP_INIT, "EEPROM addr %x : %x", i, eprom_read(dev,i));
-	}
+	for (i = 0; i < 0xff; i++)
+		RT_TRACE(COMP_INIT, "EEPROM addr %x : %x", i,
+			 eprom_read(dev, i));
 }
 
 /* this is only for debug */
@@ -102,18 +100,18 @@ void rtl8192_dump_reg(struct net_device *dev)
 	RT_TRACE(COMP_INIT, "Dumping NIC register map");
 
 	for (n = 0; n <= max; ) {
-		printk( "\nD: %2x> ", n);
+		printk(KERN_INFO "\nD: %2x> ", n);
 		for (i = 0; i < 16 && n <= max; i++, n++)
-			printk("%2x ", read_nic_byte(dev, n));
+			printk(KERN_INFO "%2x ", read_nic_byte(dev, n));
 	}
-	printk("\n");
+	printk(KERN_INFO "\n");
 }
 
 /****************************************************************************
    -----------------------------PROCFS STUFF-------------------------
 *****************************************************************************/
 /*This part is related to PROC, which will record some statistics. */
-static struct proc_dir_entry *rtl8192_proc = NULL;
+static struct proc_dir_entry *rtl8192_proc;
 
 static int proc_get_stats_ap(char *page, char **start,
 			  off_t offset, int count,
@@ -123,24 +121,21 @@ static int proc_get_stats_ap(char *page, char **start,
 	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 	struct rtllib_device *ieee = priv->rtllib;
 	struct rtllib_network *target;
-
 	int len = 0;
 
-        list_for_each_entry(target, &ieee->network_list, list) {
+	list_for_each_entry(target, &ieee->network_list, list) {
 
 		len += snprintf(page + len, count - len,
-                "%s ", target->ssid);
+				"%s ", target->ssid);
 
-		if (target->wpa_ie_len>0 || target->rsn_ie_len>0){
-	                len += snprintf(page + len, count - len,
-		        "WPA\n");
-		}
-		else{
-                        len += snprintf(page + len, count - len,
-                        "non_WPA\n");
-                }
+		if (target->wpa_ie_len > 0 || target->rsn_ie_len > 0)
+			len += snprintf(page + len, count - len,
+					"WPA\n");
+		else
+			len += snprintf(page + len, count - len,
+					"non_WPA\n");
 
-        }
+	}
 
 	*eof = 1;
 	return len;
@@ -153,25 +148,25 @@ static int proc_get_registers_0(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0x000;
 
-	{
-		len += snprintf(page + len, count - len,
-				"\n####################page %x##################\n ", (page0>>8));
-		len += snprintf(page + len, count - len,
-				"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-		for (n=0;n<=max;)
-		{
-			len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-			for (i=0;i<16 && n<=max;n++,i++)
-				len += snprintf(page + len, count - len,
-						"%2.2x ",read_nic_byte(dev,(page0|n)));
-		}
+	len += snprintf(page + len, count - len,
+			"\n####################page %x##################\n ",
+			(page0>>8));
+	len += snprintf(page + len, count - len,
+			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+			"0C 0D 0E 0F");
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 16 && n <= max; n++, i++)
+			len += snprintf(page + len, count - len,
+					"%2.2x ", read_nic_byte(dev,
+					(page0 | n)));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 
@@ -183,25 +178,27 @@ static int proc_get_registers_1(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0x100;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
+			"\n####################page %x##################\n ",
+			(page0>>8));
 	len += snprintf(page + len, count - len,
-			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-	for (n=0;n<=max;)
-	{
+			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+			"0C 0D 0E 0F");
+	for (n = 0; n <= max;) {
 		len += snprintf(page + len, count - len,
-				"\nD:  %2x > ",n);
-		for (i=0;i<16 && n<=max;i++,n++)
+				"\nD:  %2x > ", n);
+		for (i = 0; i < 16 && n <= max; i++, n++)
 			len += snprintf(page + len, count - len,
-					"%2.2x ",read_nic_byte(dev,(page0|n)));
+					"%2.2x ", read_nic_byte(dev,
+					(page0 | n)));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 
@@ -213,25 +210,27 @@ static int proc_get_registers_2(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0x200;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
+			"\n####################page %x##################\n ",
+			(page0 >> 8));
 	len += snprintf(page + len, count - len,
-			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-	for (n=0;n<=max;)
-	{
+			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C "
+			"0D 0E 0F");
+	for (n = 0; n <= max;) {
 		len += snprintf(page + len, count - len,
-				"\nD:  %2x > ",n);
-		for (i=0;i<16 && n<=max;i++,n++)
+				"\nD:  %2x > ", n);
+		for (i = 0; i < 16 && n <= max; i++, n++)
 			len += snprintf(page + len, count - len,
-					"%2.2x ",read_nic_byte(dev,(page0|n)));
+					"%2.2x ", read_nic_byte(dev,
+					(page0 | n)));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 
@@ -243,25 +242,27 @@ static int proc_get_registers_3(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0x300;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
+			"\n####################page %x##################\n ",
+			(page0>>8));
 	len += snprintf(page + len, count - len,
-			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-	for (n=0;n<=max;)
-	{
+			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+			"0C 0D 0E 0F");
+	for (n = 0; n <= max;) {
 		len += snprintf(page + len, count - len,
-				"\nD:  %2x > ",n);
-		for (i=0;i<16 && n<=max;i++,n++)
+				"\nD:  %2x > ", n);
+		for (i = 0; i < 16 && n <= max; i++, n++)
 			len += snprintf(page + len, count - len,
-					"%2.2x ",read_nic_byte(dev,(page0|n)));
+					"%2.2x ", read_nic_byte(dev,
+					(page0 | n)));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 
@@ -273,117 +274,125 @@ static int proc_get_registers_4(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0x400;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
+			"\n####################page %x##################\n ",
+			(page0>>8));
 	len += snprintf(page + len, count - len,
-			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-	for (n=0;n<=max;)
-	{
+			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+			"0C 0D 0E 0F");
+	for (n = 0; n <= max;) {
 		len += snprintf(page + len, count - len,
-				"\nD:  %2x > ",n);
-		for (i=0;i<16 && n<=max;i++,n++)
+				"\nD:  %2x > ", n);
+		for (i = 0; i < 16 && n <= max; i++, n++)
 			len += snprintf(page + len, count - len,
-					"%2.2x ",read_nic_byte(dev,(page0|n)));
+					"%2.2x ", read_nic_byte(dev,
+					(page0 | n)));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 
 }
 static int proc_get_registers_5(char *page, char **start,
-                          off_t offset, int count,
-                          int *eof, void *data)
+			  off_t offset, int count,
+			  int *eof, void *data)
 {
-        struct net_device *dev = data;
+	struct net_device *dev = data;
 
-        int len = 0;
-        int i,n,page0;
+	int len = 0;
+	int i, n, page0;
 
-        int max=0xff;
-        page0 = 0x500;
+	int max = 0xff;
+	page0 = 0x500;
 
-        /* This dump the current register page */
-        len += snprintf(page + len, count - len,
-                        "\n####################page %x##################\n ", (page0>>8));
+	/* This dump the current register page */
+	len += snprintf(page + len, count - len,
+			"\n####################page %x##################\n ",
+			(page0 >> 8));
 	len += snprintf(page + len, count - len,
-			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-        for (n=0;n<=max;)
-        {
-                len += snprintf(page + len, count - len,
-                                "\nD:  %2x > ",n);
-                for (i=0;i<16 && n<=max;i++,n++)
-                        len += snprintf(page + len, count - len,
-                                        "%2.2x ",read_nic_byte(dev,(page0|n)));
-        }
-        len += snprintf(page + len, count - len,"\n");
-        *eof = 1;
-        return len;
+			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+			"0C 0D 0E 0F");
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len,
+				"\nD:  %2x > ", n);
+		for (i = 0; i < 16 && n <= max; i++, n++)
+			len += snprintf(page + len, count - len,
+					"%2.2x ", read_nic_byte(dev,
+					(page0 | n)));
+	}
+	len += snprintf(page + len, count - len, "\n");
+	*eof = 1;
+	return len;
 
 }
 static int proc_get_registers_6(char *page, char **start,
-                          off_t offset, int count,
-                          int *eof, void *data)
+			  off_t offset, int count,
+			  int *eof, void *data)
 {
-        struct net_device *dev = data;
+	struct net_device *dev = data;
 
-        int len = 0;
-        int i,n,page0;
+	int len = 0;
+	int i, n, page0;
 
-        int max=0xff;
-        page0 = 0x600;
+	int max = 0xff;
+	page0 = 0x600;
 
-        /* This dump the current register page */
-        len += snprintf(page + len, count - len,
-                        "\n####################page %x##################\n ", (page0>>8));
+	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-        for (n=0;n<=max;)
-        {
-                len += snprintf(page + len, count - len,
-                                "\nD:  %2x > ",n);
-                for (i=0;i<16 && n<=max;i++,n++)
-                        len += snprintf(page + len, count - len,
-                                        "%2.2x ",read_nic_byte(dev,(page0|n)));
-        }
-        len += snprintf(page + len, count - len,"\n");
-        *eof = 1;
-        return len;
+			"\n####################page %x##################\n ",
+			(page0>>8));
+	len += snprintf(page + len, count - len,
+			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+			"0C 0D 0E 0F");
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len,
+				"\nD:  %2x > ", n);
+		for (i = 0; i < 16 && n <= max; i++, n++)
+			len += snprintf(page + len, count - len,
+					"%2.2x ", read_nic_byte(dev,
+					(page0 | n)));
+	}
+	len += snprintf(page + len, count - len, "\n");
+	*eof = 1;
+	return len;
 
 }
 static int proc_get_registers_7(char *page, char **start,
-                          off_t offset, int count,
-                          int *eof, void *data)
+			  off_t offset, int count,
+			  int *eof, void *data)
 {
-        struct net_device *dev = data;
+	struct net_device *dev = data;
 
-        int len = 0;
-        int i,n,page0;
+	int len = 0;
+	int i, n, page0;
 
-        int max=0xff;
-        page0 = 0x700;
+	int max = 0xff;
+	page0 = 0x700;
 
-        /* This dump the current register page */
-        len += snprintf(page + len, count - len,
-                        "\n####################page %x##################\n ", (page0>>8));
+	/* This dump the current register page */
+	len += snprintf(page + len, count - len,
+			"\n####################page %x##################\n ",
+			(page0 >> 8));
 	len += snprintf(page + len, count - len,
-			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-        for (n=0;n<=max;)
-        {
-                len += snprintf(page + len, count - len,
-                                "\nD:  %2x > ",n);
-                for (i=0;i<16 && n<=max;i++,n++)
-                        len += snprintf(page + len, count - len,
-                                        "%2.2x ",read_nic_byte(dev,(page0|n)));
-        }
-        len += snprintf(page + len, count - len,"\n");
-        *eof = 1;
-        return len;
+			"\nD:  OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C "
+			"0D 0E 0F");
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len,
+				"\nD:  %2x > ", n);
+		for (i = 0; i < 16 && n <= max; i++, n++)
+			len += snprintf(page + len, count - len,
+					"%2.2x ", read_nic_byte(dev,
+					(page0 | n)));
+	}
+	len += snprintf(page + len, count - len, "\n");
+	*eof = 1;
+	return len;
 
 }
 static int proc_get_registers_8(char *page, char **start,
@@ -393,22 +402,23 @@ static int proc_get_registers_8(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0x800;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+			"\n####################page %x##################\n",
+			(page0 >> 8));
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+					"%8.8x ", rtl8192_QueryBBReg(dev,
+					(page0 | n), bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 
@@ -420,22 +430,23 @@ static int proc_get_registers_9(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0x900;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+			"\n####################page %x##################\n",
+			(page0>>8));
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+					"%8.8x ", rtl8192_QueryBBReg(dev,
+					(page0 | n), bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -446,22 +457,23 @@ static int proc_get_registers_a(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0xa00;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+			"\n####################page %x##################\n",
+			(page0>>8));
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+					"%8.8x ", rtl8192_QueryBBReg(dev,
+					(page0 | n), bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -472,22 +484,23 @@ static int proc_get_registers_b(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0xb00;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+			"\n####################page %x##################\n",
+			(page0 >> 8));
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+					"%8.8x ", rtl8192_QueryBBReg(dev,
+					(page0 | n), bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -498,22 +511,23 @@ static int proc_get_registers_c(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0xc00;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+			"\n####################page %x##################\n",
+			(page0>>8));
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+					"%8.8x ", rtl8192_QueryBBReg(dev,
+					(page0 | n), bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -524,22 +538,23 @@ static int proc_get_registers_d(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0xd00;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+			"\n####################page %x##################\n",
+			(page0>>8));
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+					"%8.8x ", rtl8192_QueryBBReg(dev,
+					(page0 | n), bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -550,22 +565,23 @@ static int proc_get_registers_e(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n,page0;
+	int i, n, page0;
 
-	int max=0xff;
+	int max = 0xff;
 	page0 = 0xe00;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n####################page %x##################\n ", (page0>>8));
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+			"\n####################page %x##################\n",
+			(page0>>8));
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+					"%8.8x ", rtl8192_QueryBBReg(dev,
+					(page0 | n), bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -577,21 +593,22 @@ static int proc_get_reg_rf_a(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n;
+	int i, n;
 
-	int max=0xff;
+	int max = 0xff;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
 			"\n#################### RF-A ##################\n ");
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_A,n, bMaskDWord));
+					"%8.8x ", rtl8192_phy_QueryRFReg(dev,
+					(enum rf90_radio_path)RF90_PATH_A, n,
+					bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -603,21 +620,22 @@ static int proc_get_reg_rf_b(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n;
+	int i, n;
 
-	int max=0xff;
+	int max = 0xff;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
 			"\n#################### RF-B ##################\n ");
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_B, n, bMaskDWord));
+					"%8.8x ", rtl8192_phy_QueryRFReg(dev,
+					(enum rf90_radio_path)RF90_PATH_B, n,
+					bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -629,21 +647,22 @@ static int proc_get_reg_rf_c(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n;
+	int i, n;
 
-	int max=0xff;
+	int max = 0xff;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-			"\n#################### RF-C ##################\n ");
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+			"\n#################### RF-C ##################\n");
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_C, n, bMaskDWord));
+					"%8.8x ", rtl8192_phy_QueryRFReg(dev,
+					(enum rf90_radio_path)RF90_PATH_C, n,
+					bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -655,21 +674,22 @@ static int proc_get_reg_rf_d(char *page, char **start,
 	struct net_device *dev = data;
 
 	int len = 0;
-	int i,n;
+	int i, n;
 
-	int max=0xff;
+	int max = 0xff;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
 			"\n#################### RF-D ##################\n ");
-	for (n=0;n<=max;)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",n);
-		for (i=0;i<4 && n<=max;n+=4,i++)
+	for (n = 0; n <= max;) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", n);
+		for (i = 0; i < 4 && n <= max; n += 4, i++)
 			len += snprintf(page + len, count - len,
-					"%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_D, n, bMaskDWord));
+					"%8.8x ", rtl8192_phy_QueryRFReg(dev,
+					(enum rf90_radio_path)RF90_PATH_D, n,
+					bMaskDWord));
 	}
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -679,41 +699,38 @@ static int proc_get_cam_register_1(char *page, char **start,
 			  int *eof, void *data)
 {
 	struct net_device *dev = data;
-	u32 target_command=0;
-	u32 target_content=0;
-	u8 entry_i=0;
+	u32 target_command = 0;
+	u32 target_content = 0;
+	u8 entry_i = 0;
 	u32 ulStatus;
 	int len = 0;
-	int i=100, j = 0;
+	int i = 100, j = 0;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-				"\n#################### SECURITY CAM (0-10) ##################\n ");
-	for (j=0; j<11; j++)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",j);
-		for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
-		{
-			target_command= entry_i+CAM_CONTENT_COUNT*j;
-			target_command= target_command | BIT31;
-
-			while((i--)>=0)
-			{
+			"\n#################### SECURITY CAM (0-10) ######"
+			"############\n ");
+	for (j = 0; j < 11; j++) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", j);
+		for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
+			target_command = entry_i+CAM_CONTENT_COUNT*j;
+			target_command = target_command | BIT31;
+
+			while ((i--) >= 0) {
 				ulStatus = read_nic_dword(dev, RWCAM);
-				if (ulStatus & BIT31){
+				if (ulStatus & BIT31)
 					continue;
-				}
-				else{
+				else
 					break;
-				}
 			}
 			write_nic_dword(dev, RWCAM, target_command);
 			target_content = read_nic_dword(dev, RCAMO);
-			len += snprintf(page + len, count - len,"%8.8x ",target_content);
+			len += snprintf(page + len, count - len, "%8.8x ",
+					target_content);
 		}
 	}
 
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -723,41 +740,38 @@ static int proc_get_cam_register_2(char *page, char **start,
 			  int *eof, void *data)
 {
 	struct net_device *dev = data;
-	u32 target_command=0;
-	u32 target_content=0;
-	u8 entry_i=0;
+	u32 target_command = 0;
+	u32 target_content = 0;
+	u8 entry_i = 0;
 	u32 ulStatus;
 	int len = 0;
-	int i=100, j = 0;
+	int i = 100, j = 0;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-				"\n#################### SECURITY CAM (11-21) ##################\n ");
-	for (j=11; j<22; j++)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",j);
-		for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
-		{
-			target_command= entry_i+CAM_CONTENT_COUNT*j;
-			target_command= target_command | BIT31;
-
-			while((i--)>=0)
-			{
+			"\n#################### SECURITY CAM (11-21) "
+			"##################\n ");
+	for (j = 11; j < 22; j++) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", j);
+		for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
+			target_command = entry_i + CAM_CONTENT_COUNT * j;
+			target_command = target_command | BIT31;
+
+			while ((i--) >= 0) {
 				ulStatus = read_nic_dword(dev, RWCAM);
-				if (ulStatus & BIT31){
+				if (ulStatus & BIT31)
 					continue;
-				}
-				else{
+				else
 					break;
-				}
 			}
 			write_nic_dword(dev, RWCAM, target_command);
 			target_content = read_nic_dword(dev, RCAMO);
-			len += snprintf(page + len, count - len,"%8.8x ",target_content);
+			len += snprintf(page + len, count - len, "%8.8x ",
+					target_content);
 		}
 	}
 
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -767,41 +781,38 @@ static int proc_get_cam_register_3(char *page, char **start,
 			  int *eof, void *data)
 {
 	struct net_device *dev = data;
-	u32 target_command=0;
-	u32 target_content=0;
-	u8 entry_i=0;
+	u32 target_command = 0;
+	u32 target_content = 0;
+	u8 entry_i = 0;
 	u32 ulStatus;
 	int len = 0;
-	int i=100, j = 0;
+	int i = 100, j = 0;
 
 	/* This dump the current register page */
 	len += snprintf(page + len, count - len,
-				"\n#################### SECURITY CAM (22-31) ##################\n ");
-	for (j=22; j<TOTAL_CAM_ENTRY; j++)
-	{
-		len += snprintf(page + len, count - len, "\nD:  %2x > ",j);
-		for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
-		{
-			target_command= entry_i+CAM_CONTENT_COUNT*j;
-			target_command= target_command | BIT31;
-
-			while((i--)>=0)
-			{
+			"\n#################### SECURITY CAM (22-31) ######"
+			"############\n ");
+	for (j = 22; j < TOTAL_CAM_ENTRY; j++) {
+		len += snprintf(page + len, count - len, "\nD:  %2x > ", j);
+		for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
+			target_command = entry_i + CAM_CONTENT_COUNT * j;
+			target_command = target_command | BIT31;
+
+			while ((i--) >= 0) {
 				ulStatus = read_nic_dword(dev, RWCAM);
-				if (ulStatus & BIT31){
+				if (ulStatus & BIT31)
 					continue;
-				}
-				else{
+				else
 					break;
-				}
 			}
 			write_nic_dword(dev, RWCAM, target_command);
 			target_content = read_nic_dword(dev, RCAMO);
-			len += snprintf(page + len, count - len,"%8.8x ",target_content);
+			len += snprintf(page + len, count - len, "%8.8x ",
+					target_content);
 		}
 	}
 
-	len += snprintf(page + len, count - len,"\n");
+	len += snprintf(page + len, count - len, "\n");
 	*eof = 1;
 	return len;
 }
@@ -877,7 +888,7 @@ static int proc_get_stats_rx(char *page, char **start,
 void rtl8192_proc_module_init(void)
 {
 	RT_TRACE(COMP_INIT, "Initializing proc filesystem");
-	rtl8192_proc=create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net);
+	rtl8192_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net);
 }
 
 
@@ -891,7 +902,7 @@ void rtl8192_proc_remove_one(struct net_device *dev)
 {
 	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
-	printk("dev name %s\n",dev->name);
+	printk(KERN_INFO "dev name %s\n", dev->name);
 
 	if (priv->dir_dev) {
 		remove_proc_entry("stats-tx", priv->dir_dev);
@@ -929,194 +940,169 @@ void rtl8192_proc_init_one(struct net_device *dev)
 {
 	struct proc_dir_entry *e;
 	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
+
 	priv->dir_dev = create_proc_entry(dev->name,
 					  S_IFDIR | S_IRUGO | S_IXUGO,
 					  rtl8192_proc);
 	if (!priv->dir_dev) {
-		RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
-		      dev->name);
+		RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192"
+			 "/%s\n", dev->name);
 		return;
 	}
 	e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_stats_rx, dev);
 
-	if (!e) {
-		RT_TRACE(COMP_ERR,"Unable to initialize "
+	if (!e)
+		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/stats-rx\n",
 		      dev->name);
-	}
-
 
 	e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_stats_tx, dev);
 
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/stats-tx\n",
 		      dev->name);
-	}
 
 	e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_stats_ap, dev);
 
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/stats-ap\n",
 		      dev->name);
-	}
 
 	e = create_proc_read_entry("registers-0", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_0, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-0\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-1", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_1, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-1\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-2", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_2, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-2\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-3", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_3, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-3\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-4", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_4, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-4\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-5", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_5, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-5\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-6", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_6, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-6\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-7", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_7, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-7\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-8", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_8, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-8\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-9", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_9, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-9\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-a", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_a, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-a\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-b", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_b, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-b\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-c", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_c, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-c\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-d", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_d, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-d\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("registers-e", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_registers_e, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/registers-e\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("RF-A", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_reg_rf_a, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/RF-A\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("RF-B", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_reg_rf_b, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/RF-B\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("RF-C", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_reg_rf_c, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/RF-C\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("RF-D", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_reg_rf_d, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/RF-D\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("SEC-CAM-1", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_cam_register_1, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/SEC-CAM-1\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("SEC-CAM-2", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_cam_register_2, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/SEC-CAM-2\n",
 		      dev->name);
-	}
 	e = create_proc_read_entry("SEC-CAM-3", S_IFREG | S_IRUGO,
 				   priv->dir_dev, proc_get_cam_register_3, dev);
-	if (!e) {
+	if (!e)
 		RT_TRACE(COMP_ERR, "Unable to initialize "
 		      "/proc/net/rtl8192/%s/SEC-CAM-3\n",
 		      dev->name);
-	}
 }