staging: rtl8192u: Fixing style issues in r8180_93cx6.c
PATCH v2 7/9 staging: rtl8192u: Fixing style issues in r8180_93cx6.c
Fixing the following checkpatch.pl errors and warning:
WARNING: Block comments use * on subsequent lines
CHECK: Please don't use multiple blank lines
CHECK: Alignment should match open parenthesis
CHECK: spaces preferred around that '<<'
CHECK: spaces preferred around that '-'
CHECK: Alignment should match open parenthesis
--- drivers/staging/rtl8192u/r8180_93cx6.c | 71 ++++++++++++++++------------------ 1 file changed, 33 insertions(+), 38 deletions(-)
drivers/staging/rtl8192u/r8180_93cx6.c +33 -38
@@ -1,22 +1,22 @@/* -This files contains card eeprom (93c46 or 93c56) programming routines, -memory is addressed by 16 bits words. - -This is part of rtl8180 OpenSource driver. -Copyright (C) Andrea Merello 2004 <[email protected]> -Released under the terms of GPL (General Public Licence) - -Parts of this driver are based on the GPL part of the -official realtek driver. - -Parts of this driver are based on the rtl8180 driver skeleton -from Patric Schenke & Andres Salomon. - -Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver. - -We want to thank the Authors of those projects and the Ndiswrapper -project Authors. -*/ +* This files contains card eeprom (93c46 or 93c56) programming routines, +* memory is addressed by 16 bits words. +* +* This is part of rtl8180 OpenSource driver. +* Copyright (C) Andrea Merello 2004 <[email protected]> +* Released under the terms of GPL (General Public Licence) +* +* Parts of this driver are based on the GPL part of the +* official realtek driver. +* +* Parts of this driver are based on the rtl8180 driver skeleton +* from Patric Schenke & Andres Salomon. +* +* Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver. +* +* We want to thank the Authors of those projects and the Ndiswrapper +* project Authors. +*/ #include "r8180_93cx6.h"
@@ -39,7 +39,6 @@ static void eprom_cs(struct net_device *dev, short bit)udelay (EPROM_DELAY ); } -static void eprom_ck_cycle (struct net_device *dev) {u8 cmdreg;
@@ -58,7 +57,6 @@ static void eprom_ck_cycle(struct net_device *dev)udelay (EPROM_DELAY ); } -static void eprom_w (struct net_device *dev,short bit) {u8 cmdreg;
@@ -76,7 +74,6 @@ static void eprom_w(struct net_device *dev, short bit)udelay (EPROM_DELAY ); } -static short eprom_r (struct net_device *dev) {u8 bit;
@@ -94,7 +91,6 @@ static short eprom_r(struct net_device *dev)return 0 ; } -static void eprom_send_bits_string (struct net_device *dev,short b[],int len) {int i;
@@ -105,7 +101,6 @@ static void eprom_send_bits_string(struct net_device *dev, short b[], int len) } } -int eprom_read (struct net_device *dev,u32 addr) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -119,27 +114,27 @@ int eprom_read(struct net_device *dev, u32 addr) ret =0 ;/* enable EPROM programming */ write_nic_byte_E (dev,EPROM_CMD , - (EPROM_CMD_PROGRAM <<EPROM_CMD_OPERATING_MODE_SHIFT )); + (EPROM_CMD_PROGRAM <<EPROM_CMD_OPERATING_MODE_SHIFT ));force_pci_posting (dev);udelay (EPROM_DELAY );if (priv->epromtype == EPROM_93c56) { addr_str[7 ] = addr &1 ; - addr_str[6 ] = addr & (1 <<1 ); - addr_str[5 ] = addr & (1 <<2 ); - addr_str[4 ] = addr & (1 <<3 ); - addr_str[3 ] = addr & (1 <<4 ); - addr_str[2 ] = addr & (1 <<5 ); - addr_str[1 ] = addr & (1 <<6 ); - addr_str[0 ] = addr & (1 <<7 ); + addr_str[6 ] = addr & (1 <<1 ); + addr_str[5 ] = addr & (1 <<2 ); + addr_str[4 ] = addr & (1 <<3 ); + addr_str[3 ] = addr & (1 <<4 ); + addr_str[2 ] = addr & (1 <<5 ); + addr_str[1 ] = addr & (1 <<6 ); + addr_str[0 ] = addr & (1 <<7 ); addr_len =8 ; }else { addr_str[5 ] = addr &1 ; - addr_str[4 ] = addr & (1 <<1 ); - addr_str[3 ] = addr & (1 <<2 ); - addr_str[2 ] = addr & (1 <<3 ); - addr_str[1 ] = addr & (1 <<4 ); - addr_str[0 ] = addr & (1 <<5 ); + addr_str[4 ] = addr & (1 <<1 ); + addr_str[3 ] = addr & (1 <<2 ); + addr_str[2 ] = addr & (1 <<3 ); + addr_str[1 ] = addr & (1 <<4 ); + addr_str[0 ] = addr & (1 <<5 ); addr_len =6 ; }eprom_cs (dev,1 );
@@ -162,7 +157,7 @@ int eprom_read(struct net_device *dev, u32 addr)if (err <0 )return err; - ret |= err<<(15 -i); + ret |= err << (15 - i); }eprom_cs (dev,0 );
@@ -170,6 +165,6 @@ int eprom_read(struct net_device *dev, u32 addr)/* disable EPROM programming */ write_nic_byte_E (dev,EPROM_CMD , - (EPROM_CMD_NORMAL <<EPROM_CMD_OPERATING_MODE_SHIFT )); + (EPROM_CMD_NORMAL <<EPROM_CMD_OPERATING_MODE_SHIFT ));return ret; }
Signature · 1 line
2.7.4
Greg KH
maintainerQuoted 7 lines · simran singhal
Fixing the following checkpatch.pl errors and warning:
WARNING: Block comments use * on subsequent linesCHECK: Please don't use multiple blank lines
CHECK: Alignment should match open parenthesis
Quoted 7 lines
CHECK: spaces preferred around that '<<'
CHECK: spaces preferred around that '-'
CHECK: Alignment should match open parenthesis
Signed-off-by simran singhal <[email protected]>
That's a lot of different things all in one patch. Please don't do that, break up into individual patches.
greg k-h