Skip to contentSkip to conversation

staging/rtl8192u: cleanup coding style problems

PATCH Superseded Devendra Naga 2 participants 3 messages Jun 17, 2012 – Jun 19, 2012 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Devendra Naga

author
#0 lore raw

PATCH 1/2 staging/rtl8192u: cleanup coding style problems

The following warnings / errors were cleaned

drivers/staging/rtl8192u/r8180_93cx6.c:25: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:28: ERROR: do not use C99 // comments drivers/staging/rtl8192u/r8180_93cx6.c:30: WARNING: line over 80 characters drivers/staging/rtl8192u/r8180_93cx6.c:31: ERROR: do not use C99 // comments drivers/staging/rtl8192u/r8180_93cx6.c:41: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:45: ERROR: need consistent spacing a round '&' (ctx:WxO) drivers/staging/rtl8192u/r8180_93cx6.c:45: ERROR: space prohibited after that '~' (ctx:OxW) drivers/staging/rtl8192u/r8180_93cx6.c:51: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:53: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:55: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:57: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:69: ERROR: spaces required around that '=' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:69: ERROR: space prohibited before that close parenthesis ')' drivers/staging/rtl8192u/r8180_93cx6.c:72: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:72: ERROR: trailing statements should be on next line

Signed-off-by Devendra Naga <[email protected]>
---
 drivers/staging/rtl8192u/r8180_93cx6.c |   35 +++++++++++++++++---------------
 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/staging/rtl8192u/r8180_93cx6.c +19 -16
index 3c515b7..e48a5aa 100644
@@ -22,13 +22,17 @@
 
 void eprom_cs(struct net_device *dev, short bit)
 {
-	if(bit)
+	if (bit) {
+		/* enable EPROM */
 		write_nic_byte_E(dev, EPROM_CMD,
-			       (1<<EPROM_CS_SHIFT) | \
-			       read_nic_byte_E(dev, EPROM_CMD)); //enable EPROM
-	else
-		write_nic_byte_E(dev, EPROM_CMD, read_nic_byte_E(dev, EPROM_CMD)\
-			       &~(1<<EPROM_CS_SHIFT)); //disable EPROM
+				(1<<EPROM_CS_SHIFT) |
+				read_nic_byte_E(dev, EPROM_CMD));
+	} else {
+		/* disable EPROM */
+		write_nic_byte_E(dev, EPROM_CMD,
+				read_nic_byte_E(dev, EPROM_CMD)
+				&~(1<<EPROM_CS_SHIFT));
+	}
 
 	force_pci_posting(dev);
 	udelay(EPROM_DELAY);

@@ -38,23 +42,23 @@ void eprom_cs(struct net_device *dev, short bit)
 void eprom_ck_cycle(struct net_device *dev)
 {
 	write_nic_byte_E(dev, EPROM_CMD,
-		       (1<<EPROM_CK_SHIFT) | read_nic_byte_E(dev,EPROM_CMD));
+		       (1<<EPROM_CK_SHIFT) | read_nic_byte_E(dev, EPROM_CMD));
 	force_pci_posting(dev);
 	udelay(EPROM_DELAY);
 	write_nic_byte_E(dev, EPROM_CMD,
-		       read_nic_byte_E(dev, EPROM_CMD) &~ (1<<EPROM_CK_SHIFT));
+		       read_nic_byte_E(dev, EPROM_CMD) & ~(1<<EPROM_CK_SHIFT));
 	force_pci_posting(dev);
 	udelay(EPROM_DELAY);
 }
 
 
-void eprom_w(struct net_device *dev,short bit)
+void eprom_w(struct net_device *dev, short bit)
 {
-	if(bit)
-		write_nic_byte_E(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | \
-			       read_nic_byte_E(dev,EPROM_CMD));
+	if (bit)
+		write_nic_byte_E(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) |
+			       read_nic_byte_E(dev, EPROM_CMD));
 	else
-		write_nic_byte_E(dev, EPROM_CMD, read_nic_byte_E(dev,EPROM_CMD)\
+		write_nic_byte_E(dev, EPROM_CMD, read_nic_byte_E(dev, EPROM_CMD)
 			       &~(1<<EPROM_W_SHIFT));
 
 	force_pci_posting(dev);

@@ -66,11 +70,10 @@ short eprom_r(struct net_device *dev)
 {
 	short bit;
 
-	bit=(read_nic_byte_E(dev, EPROM_CMD) & (1<<EPROM_R_SHIFT) );
+	bit = (read_nic_byte_E(dev, EPROM_CMD) & (1<<EPROM_R_SHIFT));
 	udelay(EPROM_DELAY);
 
-	if(bit) return 1;
-	return 0;
+	return bit ? 1: 0;
 }
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw
Quoted 18 lines · Devendra Naga

The following warnings / errors were cleaned

drivers/staging/rtl8192u/r8180_93cx6.c:25: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:28: ERROR: do not use C99 // comments drivers/staging/rtl8192u/r8180_93cx6.c:30: WARNING: line over 80 characters drivers/staging/rtl8192u/r8180_93cx6.c:31: ERROR: do not use C99 // comments drivers/staging/rtl8192u/r8180_93cx6.c:41: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:45: ERROR: need consistent spacing a round '&' (ctx:WxO) drivers/staging/rtl8192u/r8180_93cx6.c:45: ERROR: space prohibited after that '~' (ctx:OxW) drivers/staging/rtl8192u/r8180_93cx6.c:51: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:53: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:55: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:57: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:69: ERROR: spaces required around that '=' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:69: ERROR: space prohibited before that close parenthesis ')' drivers/staging/rtl8192u/r8180_93cx6.c:72: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:72: ERROR: trailing statements should be on next line

Quoted 1 line
Signed-off-by Devendra Naga <[email protected]>

It's good you broke this down as to what you were fixing, but I don't like this change:

drivers/staging/rtl8192u/r8180_93cx6.c short eprom_r(struct net_device *dev) · line 76

Quoted 3 lines
drivers/staging/rtl8192u/r8180_93cx6.c +1 -2
-	if(bit) return 1;
-	return 0;
+	return bit ? 1: 0;

Please don't use ? : if you can help it, it is just hard to read.

Care to redo this one and resend both patches?

thanks,

greg k-h

author
#2 lore raw

Hi Greg,

Thanks for spending your valuable time in reviewing the patch,

Quoted 21 lines · Greg Kroah-Hartman
Quoted 18 lines · Devendra Naga

The following warnings / errors were cleaned

drivers/staging/rtl8192u/r8180_93cx6.c:25: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:28: ERROR: do not use C99 // comments drivers/staging/rtl8192u/r8180_93cx6.c:30: WARNING: line over 80 characters drivers/staging/rtl8192u/r8180_93cx6.c:31: ERROR: do not use C99 // comments drivers/staging/rtl8192u/r8180_93cx6.c:41: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:45: ERROR: need consistent spacing a round '&' (ctx:WxO) drivers/staging/rtl8192u/r8180_93cx6.c:45: ERROR: space prohibited after that '~' (ctx:OxW) drivers/staging/rtl8192u/r8180_93cx6.c:51: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:53: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:55: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:57: ERROR: space required after that ',' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:69: ERROR: spaces required around that '=' (ctx:VxV) drivers/staging/rtl8192u/r8180_93cx6.c:69: ERROR: space prohibited before that close parenthesis ')' drivers/staging/rtl8192u/r8180_93cx6.c:72: ERROR: space required before the open parenthesis '(' drivers/staging/rtl8192u/r8180_93cx6.c:72: ERROR: trailing statements should be on next line

Quoted 1 line
Signed-off-by Devendra Naga <[email protected]>
Quoted 8 lines

It's good you broke this down as to what you were fixing, but I don't like this change:

Quoted 3 lines

-     if(bit) return 1;
-     return 0;
+     return bit ? 1: 0;

Please don't use ? : if you can help it, it is just hard to read.

Ok.

Quoted 3 lines

Care to redo this one and resend both patches?

You can expect a V2 of your comments :-),
and the second patch will be broken into little more pieces.

Quoted 3 lines

thanks,

greg k-h