staging: rtl8192e: rtllib_wx: code style improvements
PATCH 1/1 staging: rtl8192e: rtllib_wx: code style improvements
Code reformatting based on checkpatch.pl:
- Replaced min() with min_t()
- Replaced printk() with netdev_*()
- Merged broken string
--- drivers/staging/rtl8192e/rtllib_wx.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-)
drivers/staging/rtl8192e/rtllib_wx.c +13 -18
@@ -74,7 +74,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.cmd =SIOCGIWESSID ; iwe.u.data.flags =1 ;if (network->ssid_len >0 ) { - iwe.u.data.length =min (network->ssid_len, (u8 )32 ); + iwe.u.data.length =min_t (u8, network->ssid_len,32 ); start =iwe_stream_add_point_rsl (info, start, stop, &iwe, network->ssid); }else if (network->hidden_ssid_len ==0 ) {
@@ -82,7 +82,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, start =iwe_stream_add_point_rsl (info, start, stop, &iwe,"<hidden>" ); }else { - iwe.u.data.length =min (network->hidden_ssid_len, (u8 )32 ); + iwe.u.data.length =min_t (u8, network->hidden_ssid_len,32 ); start =iwe_stream_add_point_rsl (info, start, stop, &iwe, network->hidden_ssid); }
@@ -390,9 +390,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,kfree (new_crypt); new_crypt =NULL ; -printk (KERN_WARNING "%s: could not initialize WEP: " -"load module rtllib_crypt_wep\n" , - dev->name); +netdev_warn (dev,"could not initialize WEP: load module rtllib_crypt_wep\n" );return -EOPNOTSUPP ; } *crypt = new_crypt;
@@ -423,11 +421,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, NULL, (*crypt)->priv);if (len ==0 ) {/* Set a default key of all 0 */ -printk (KERN_INFO "Setting key %d to all zero.\n" , - key); - -RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , - key); +netdev_info (dev,"Setting key %d to all zero.\n" , key); +RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , key);memset (sec.keys[key],0 ,13 ); (*crypt)->ops->set_key (sec.keys[key],13 ,NULL , (*crypt)->priv);
@@ -437,8 +432,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,/* No key data - just set the default TX key index */ if (key_provided) { -RTLLIB_DEBUG_WX ( -"Setting key %d to default Tx key.\n" , key); +RTLLIB_DEBUG_WX ("Setting key %d to default Tx key.\n" , + key); ieee->crypt_info.tx_keyidx = key; sec.active_key = key; sec.flags |=SEC_ACTIVE_KEY ;
@@ -469,7 +464,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,if (ieee->reset_on_keychange && ieee->iw_mode !=IW_MODE_INFRA && ieee->reset_port && ieee->reset_port (dev)) { -printk (KERN_DEBUG "%s: reset_port failed\n" , dev->name); +netdev_dbg (dev,"reset_port failed\n" );return -EINVAL ; }return 0 ;
@@ -596,7 +591,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, ret = -EINVAL ; goto done; } -printk (KERN_INFO "alg name:%s\n" , alg); +netdev_info (dev,"alg name:%s\n" , alg); ops =lib80211_get_crypto_ops (alg);if (ops ==NULL ) {
@@ -610,7 +605,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,if (ops ==NULL ) {RTLLIB_DEBUG_WX ("%s: unknown crypto alg %d\n" , dev->name, ext->alg); -printk (KERN_INFO "========>unknown crypto alg %d\n" , ext->alg); +netdev_info (dev,"========>unknown crypto alg %d\n" , ext->alg); ret = -EINVAL ; goto done; }
@@ -642,7 +637,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, (*crypt)->ops->set_key(ext->key, ext->key_len, ext->rx_seq, (*crypt)->priv) < 0) {RTLLIB_DEBUG_WX ("%s: key setting failed\n" , dev->name); -printk (KERN_INFO "key setting failed\n" ); +netdev_info (dev,"key setting failed\n" ); ret = -EINVAL ; goto done; }
@@ -759,9 +754,9 @@ int rtllib_wx_set_mlme(struct rtllib_device *ieee,case IW_MLME_DISASSOC :if (deauth) -printk (KERN_INFO "disauth packet !\n" ); +netdev_warn (ieee->dev,"disauth packet !\n" );else -printk (KERN_INFO "dis associate packet!\n" ); +netdev_warn (ieee->dev,"dis associate packet!\n" ); ieee->cannot_notify = true;
Signature · 1 line
1.8.4.1
Quoted 1 line · Mateusz Kulikowski
- Replaced
printk()with netdev_*()
trivia:
drivers/staging/rtl8192e/rtllib_wx.c
Quoted 1 line
drivers/staging/rtl8192e/rtllib_wx.c +0
-0
[]
drivers/staging/rtl8192e/rtllib_wx.c int rtllib_wx_set_encode(struct rtllib_device *ieee, · line 425
Quoted 11 lines
drivers/staging/rtl8192e/rtllib_wx.c +2
-5@@ -423,11 +421,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, NULL, (*crypt)->priv);if (len ==0 ) {/* Set a default key of all 0 */ -printk (KERN_INFO "Setting key %d to all zero.\n" , - key); - -RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , - key); +netdev_info (dev,"Setting key %d to all zero.\n" , key); +RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , key);
This isn't something you've created but it
seems more than a bit nonsensical to emit the
same message at different logging levels.
and below....
Quoted 18 lines
drivers/staging/rtl8192e/rtllib_wx.c +2
-2@@ -610,7 +605,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,if (ops ==NULL ) {RTLLIB_DEBUG_WX ("%s: unknown crypto alg %d\n" , dev->name, ext->alg); -printk (KERN_INFO "========>unknown crypto alg %d\n" , ext->alg); +netdev_info (dev,"========>unknown crypto alg %d\n" , ext->alg); ret = -EINVAL ; goto done; }@@ -642,7 +637,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, (*crypt)->ops->set_key(ext->key, ext->key_len, ext->rx_seq, (*crypt)->priv) < 0) {RTLLIB_DEBUG_WX ("%s: key setting failed\n" , dev->name); -printk (KERN_INFO "key setting failed\n" ); +netdev_info (dev,"key setting failed\n" ); ret = -EINVAL ; goto done; }
Quoted 7 lines · Joe Perches
Quoted 1 line · Mateusz Kulikowski
- Replaced
printk()with netdev_*()trivia:
drivers/staging/rtl8192e/rtllib_wx.c
Quoted 1 line
drivers/staging/rtl8192e/rtllib_wx.c +0
-0[]
Quoted 15 lines
drivers/staging/rtl8192e/rtllib_wx.c int rtllib_wx_set_encode(struct rtllib_device *ieee, · line 425
Quoted 11 lines
drivers/staging/rtl8192e/rtllib_wx.c +2
-5@@ -423,11 +421,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, NULL, (*crypt)->priv);if (len ==0 ) {/* Set a default key of all 0 */ -printk (KERN_INFO "Setting key %d to all zero.\n" , - key); - -RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , - key); +netdev_info (dev,"Setting key %d to all zero.\n" , key); +RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , key);This isn't something you've created but it
seems more than a bit nonsensical to emit the
same message at different logging levels.
Thanks for hint - I'll throw away duplicate messages for v2.
As for all standalone RTLLIB_DEBUG* entries (in whole driver) -
I think it may be better to replace them with netdev_dbg, and use dynamic debug when needed.
M.
PATCH v2 1/1 staging: rtl8192e: rtllib_wx: code style improvements
In reply to Mateusz KulikowskiCode reformatting based on checkpatch.pl:
- Replaced min() with min_t()
- Replaced printk() with netdev_*()
- Merged broken string
---
Notes:
v2 changes - removed double messages (via netdev_info and RTLLIB_DEBUG_WX)
drivers/staging/rtl8192e/rtllib_wx.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-)
drivers/staging/rtl8192e/rtllib_wx.c +12 -21
@@ -74,7 +74,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.cmd =SIOCGIWESSID ; iwe.u.data.flags =1 ;if (network->ssid_len >0 ) { - iwe.u.data.length =min (network->ssid_len, (u8 )32 ); + iwe.u.data.length =min_t (u8, network->ssid_len,32 ); start =iwe_stream_add_point_rsl (info, start, stop, &iwe, network->ssid); }else if (network->hidden_ssid_len ==0 ) {
@@ -82,7 +82,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, start =iwe_stream_add_point_rsl (info, start, stop, &iwe,"<hidden>" ); }else { - iwe.u.data.length =min (network->hidden_ssid_len, (u8 )32 ); + iwe.u.data.length =min_t (u8, network->hidden_ssid_len,32 ); start =iwe_stream_add_point_rsl (info, start, stop, &iwe, network->hidden_ssid); }
@@ -390,9 +390,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,kfree (new_crypt); new_crypt =NULL ; -printk (KERN_WARNING "%s: could not initialize WEP: " -"load module rtllib_crypt_wep\n" , - dev->name); +netdev_warn (dev,"could not initialize WEP: load module rtllib_crypt_wep\n" );return -EOPNOTSUPP ; } *crypt = new_crypt;
@@ -423,11 +421,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, NULL, (*crypt)->priv);if (len ==0 ) {/* Set a default key of all 0 */ -printk (KERN_INFO "Setting key %d to all zero.\n" , - key); - -RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , - key); +netdev_info (dev,"Setting key %d to all zero.\n" , key);memset (sec.keys[key],0 ,13 ); (*crypt)->ops->set_key (sec.keys[key],13 ,NULL , (*crypt)->priv);
@@ -437,8 +431,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,/* No key data - just set the default TX key index */ if (key_provided) { -RTLLIB_DEBUG_WX ( -"Setting key %d to default Tx key.\n" , key); +RTLLIB_DEBUG_WX ("Setting key %d to default Tx key.\n" , + key); ieee->crypt_info.tx_keyidx = key; sec.active_key = key; sec.flags |=SEC_ACTIVE_KEY ;
@@ -469,7 +463,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,if (ieee->reset_on_keychange && ieee->iw_mode !=IW_MODE_INFRA && ieee->reset_port && ieee->reset_port (dev)) { -printk (KERN_DEBUG "%s: reset_port failed\n" , dev->name); +netdev_dbg (dev,"reset_port failed\n" );return -EINVAL ; }return 0 ;
@@ -596,7 +590,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, ret = -EINVAL ; goto done; } -printk (KERN_INFO "alg name:%s\n" , alg); +netdev_info (dev,"alg name:%s\n" , alg); ops =lib80211_get_crypto_ops (alg);if (ops ==NULL ) {
@@ -608,9 +602,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, ops =lib80211_get_crypto_ops (alg); }if (ops ==NULL ) { -RTLLIB_DEBUG_WX ("%s: unknown crypto alg %d\n" , - dev->name, ext->alg); -printk (KERN_INFO "========>unknown crypto alg %d\n" , ext->alg); +netdev_info (dev,"unknown crypto alg %d\n" , ext->alg); ret = -EINVAL ; goto done; }
@@ -641,8 +633,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,if (ext->key_len >0 && (*crypt)->ops->set_key && (*crypt)->ops->set_key (ext->key, ext->key_len, ext->rx_seq, (*crypt)->priv) <0 ) { -RTLLIB_DEBUG_WX ("%s: key setting failed\n" , dev->name); -printk (KERN_INFO "key setting failed\n" ); +netdev_info (dev,"key setting failed\n" ); ret = -EINVAL ; goto done; }
@@ -759,9 +750,9 @@ int rtllib_wx_set_mlme(struct rtllib_device *ieee,case IW_MLME_DISASSOC :if (deauth) -printk (KERN_INFO "disauth packet !\n" ); +netdev_warn (ieee->dev,"disauth packet !\n" );else -printk (KERN_INFO "dis associate packet!\n" ); +netdev_warn (ieee->dev,"dis associate packet!\n" ); ieee->cannot_notify = true;
Signature · 1 line
1.8.4.1
Greg KH
maintainerQuoted 4 lines · Mateusz Kulikowski
Code reformatting based on checkpatch.pl:
- Replacedmin()withmin_t()
- Replacedprintk()with netdev_*()
- Merged broken string
That's three different things, which means this should be at least 3 different patches. Please fix up and resend a patch series, as each patch should only do one thing.
thanks,
greg k-h
Quoted 9 lines · Greg KH
Quoted 4 lines · Mateusz Kulikowski
Code reformatting based on checkpatch.pl:
- Replacedmin()withmin_t()
- Replacedprintk()with netdev_*()
- Merged broken stringThat's three different things, which means this should be at least 3 different patches. Please fix up and resend a patch series, as each patch should only do one thing.
Will split in v3 (and do it for future patches).
Thanks for the comments,
Mateusz
v3 cover staging: rtl8192e: fix coding style issues
In reply to Mateusz KulikowskiVarious coding style fixes for rtl8192e driver. This series of patches includes v2 (changes to rtllib_wx.c), but also includes similar fixes for other files.
checkpatch.pl still complains about some of patches - this will be fixed in further commits (warnings were mostly already there):
1/6:
- usage of subsystem messages instead of printk
- line over 80 characters
2/6:
- line over 80 characters (fix would need re-indentation) 3/6:
- line over 80 characters (split will need code refactoring)
Mateusz Kulikowski (6):
staging: rtl8192e: fix coding style issues (merge broken strings)
staging: rtl8192e: fix coding style issues (replace min with min_t)
staging: rtl8192e: fix coding style issues (spaces before semicolon)
staging: rtl8192e: fix coding style errors (macros in parentheses)
staging: rtl8192e: rtllib_wx: fix coding style (printk -> netdev_*)
staging: rtl8192e: rtllib_wx: remove duplicate messages
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 51 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 30 +-- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 124 +++++++------ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 27 +-- drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 14 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 201 +++++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 22 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 142 ++++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 52 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 18 +- drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 12 +- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 24 +-- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 35 ++-- drivers/staging/rtl8192e/rtl819x_BAProc.c | 77 ++++---- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 44 ++--- drivers/staging/rtl8192e/rtl819x_TSProc.c | 53 +++--- drivers/staging/rtl8192e/rtllib.h | 4 +- drivers/staging/rtl8192e/rtllib_crypt.c | 14 +- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 24 +-- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 62 +++---- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 12 +- drivers/staging/rtl8192e/rtllib_rx.c | 18 +- drivers/staging/rtl8192e/rtllib_softmac.c | 63 ++++--- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 5 +- drivers/staging/rtl8192e/rtllib_tx.c | 8 +- drivers/staging/rtl8192e/rtllib_wx.c | 37 ++-- 28 files changed, 616 insertions(+), 567 deletions(-)
Signature · 1 line
1.8.4.1
PATCH v3 1/6 staging: rtl8192e: fix coding style issues (merge broken strings)
Fix checkpatch.pl warnings:
- 'WARNING: quoted string split across lines'
- 'WARNING: break quoted strings at a space character'
--- drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 51 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 28 +-- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 124 +++++++------ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 25 +-- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 201 +++++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 20 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 140 +++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 36 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 18 +- drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 12 +- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 24 +-- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 35 ++-- drivers/staging/rtl8192e/rtl819x_BAProc.c | 77 ++++---- drivers/staging/rtl8192e/rtl819x_HTProc.c | 44 ++--- drivers/staging/rtl8192e/rtl819x_TSProc.c | 53 +++--- drivers/staging/rtl8192e/rtllib_crypt.c | 14 +- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 24 +-- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 62 +++---- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 12 +- drivers/staging/rtl8192e/rtllib_softmac.c | 61 ++++--- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 5 +- drivers/staging/rtl8192e/rtllib_tx.c | 8 +- drivers/staging/rtl8192e/rtllib_wx.c | 7 +- 23 files changed, 566 insertions(+), 515 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +29 -22
@@ -47,8 +47,8 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, 0x0e, bMask12Bits, 0x021); }else { -RT_TRACE (COMP_ERR ,"PHY_SetRF8256Bandwidth(): " -"unknown hardware version\n" ); +RT_TRACE (COMP_ERR , +"PHY_SetRF8256Bandwidth(): unknown hardware version\n" ); }break ;
@@ -66,15 +66,16 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, 0x0e, bMask12Bits, 0x0e1); }else { -RT_TRACE (COMP_ERR ,"PHY_SetRF8256Bandwidth(): " -"unknown hardware version\n" ); +RT_TRACE (COMP_ERR , +"PHY_SetRF8256Bandwidth(): unknown hardware version\n" ); }break ;default : -RT_TRACE (COMP_ERR ,"PHY_SetRF8256Bandwidth(): unknown " -"Bandwidth: %#X\n" , Bandwidth); +RT_TRACE (COMP_ERR , +"PHY_SetRF8256Bandwidth(): unknown Bandwidth: %#X\n" , + Bandwidth);break ; }
@@ -138,8 +139,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) rtStatus =rtl8192_phy_checkBBAndRF (dev,HW90_BLOCK_RF , (enum rf90_radio_path )eRFPath);if (!rtStatus) { -RT_TRACE (COMP_ERR ,"PHY_RF8256_Config():Check " -"Radio[%d] Fail!!\n" , eRFPath); +RT_TRACE (COMP_ERR , +"PHY_RF8256_Config():Check Radio[%d] Fail!!\n" , + eRFPath); goto phy_RF8256_Config_ParaFile_Fail; }
@@ -155,9 +157,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) (enum rf90_radio_path )eRFPath, RegOffSetToBeCheck, bMask12Bits); -RT_TRACE (COMP_RF ,"RF %d %d register final " -"value: %x\n" , eRFPath, - RegOffSetToBeCheck, RF3_Final_Value); +RT_TRACE (COMP_RF , +"RF %d %d register final value: %x\n" , + eRFPath, RegOffSetToBeCheck, + RF3_Final_Value); RetryTimes--; }break ;
@@ -170,9 +173,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) (enum rf90_radio_path )eRFPath, RegOffSetToBeCheck, bMask12Bits); -RT_TRACE (COMP_RF ,"RF %d %d register final " -"value: %x\n" , eRFPath, - RegOffSetToBeCheck, RF3_Final_Value); +RT_TRACE (COMP_RF , +"RF %d %d register final value: %x\n" , + eRFPath, RegOffSetToBeCheck, + RF3_Final_Value); RetryTimes--; }break ;
@@ -185,9 +189,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) (enum rf90_radio_path )eRFPath, RegOffSetToBeCheck, bMask12Bits); -RT_TRACE (COMP_RF ,"RF %d %d register final " -"value: %x\n" , eRFPath, - RegOffSetToBeCheck, RF3_Final_Value); +RT_TRACE (COMP_RF , +"RF %d %d register final value: %x\n" , + eRFPath, RegOffSetToBeCheck, + RF3_Final_Value); RetryTimes--; }break ;
@@ -199,9 +204,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) RF3_Final_Value =rtl8192_phy_QueryRFReg (dev, (enum rf90_radio_path )eRFPath, RegOffSetToBeCheck, bMask12Bits); -RT_TRACE (COMP_RF ,"RF %d %d register final " -"value: %x\n" , eRFPath, - RegOffSetToBeCheck, RF3_Final_Value); +RT_TRACE (COMP_RF , +"RF %d %d register final value: %x\n" , + eRFPath, RegOffSetToBeCheck, + RF3_Final_Value); RetryTimes--; }break ;
@@ -221,8 +227,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) }if (ret) { -RT_TRACE (COMP_ERR ,"phy_RF8256_Config_ParaFile():" -"Radio[%d] Fail!!" , eRFPath); +RT_TRACE (COMP_ERR , +"phy_RF8256_Config_ParaFile():Radio[%d] Fail!!" , + eRFPath); goto phy_RF8256_Config_ParaFile_Fail; }
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +14 -14
@@ -332,44 +332,44 @@ u32 cmpk_message_handle_rx(struct net_device *dev,switch (element_id) {case RX_TX_FEEDBACK : -RT_TRACE (COMP_CMDPKT ,"---->cmpk_message_handle_rx():" -"RX_TX_FEEDBACK\n" ); +RT_TRACE (COMP_CMDPKT , +"---->cmpk_message_handle_rx():RX_TX_FEEDBACK\n" );cmpk_handle_tx_feedback (dev, pcmd_buff); cmd_length =CMPK_RX_TX_FB_SIZE ;break ;case RX_INTERRUPT_STATUS : -RT_TRACE (COMP_CMDPKT ,"---->cmpk_message_handle_rx():" -"RX_INTERRUPT_STATUS\n" ); +RT_TRACE (COMP_CMDPKT , +"---->cmpk_message_handle_rx():RX_INTERRUPT_STATUS\n" );cmpk_handle_interrupt_status (dev, pcmd_buff); cmd_length =sizeof (struct cmpk_intr_sta );break ;case BOTH_QUERY_CONFIG : -RT_TRACE (COMP_CMDPKT ,"---->cmpk_message_handle_rx():" -"BOTH_QUERY_CONFIG\n" ); +RT_TRACE (COMP_CMDPKT , +"---->cmpk_message_handle_rx():BOTH_QUERY_CONFIG\n" );cmpk_handle_query_config_rx (dev, pcmd_buff); cmd_length =CMPK_BOTH_QUERY_CONFIG_SIZE ;break ;case RX_TX_STATUS : -RT_TRACE (COMP_CMDPKT ,"---->cmpk_message_handle_rx():" -"RX_TX_STATUS\n" ); +RT_TRACE (COMP_CMDPKT , +"---->cmpk_message_handle_rx():RX_TX_STATUS\n" );cmpk_handle_tx_status (dev, pcmd_buff); cmd_length =CMPK_RX_TX_STS_SIZE ;break ;case RX_TX_PER_PKT_FEEDBACK : -RT_TRACE (COMP_CMDPKT ,"---->cmpk_message_handle_rx():" -"RX_TX_PER_PKT_FEEDBACK\n" ); +RT_TRACE (COMP_CMDPKT , +"---->cmpk_message_handle_rx():RX_TX_PER_PKT_FEEDBACK\n" ); cmd_length =CMPK_RX_TX_FB_SIZE ;break ;case RX_TX_RATE_HISTORY : -RT_TRACE (COMP_CMDPKT ,"---->cmpk_message_handle_rx():" -"RX_TX_HISTORY\n" ); +RT_TRACE (COMP_CMDPKT , +"---->cmpk_message_handle_rx():RX_TX_HISTORY\n" );cmpk_handle_tx_rate_history (dev, pcmd_buff); cmd_length =CMPK_TX_RAHIS_SIZE ;break ;default : -RT_TRACE (COMP_CMDPKT ,"---->cmpk_message_handle_rx():" -"unknown CMD Element\n" ); +RT_TRACE (COMP_CMDPKT , +"---->cmpk_message_handle_rx():unknown CMD Element\n" );return 1 ; }
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +65 -59
223 lines not on this page · raw message
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +13 -12
@@ -84,8 +84,8 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,if (!priv->rtllib->check_nic_enough_desc (dev, tcb_desc->queue_index) || (!skb_queue_empty (&priv->rtllib->skb_waitQ[tcb_desc->queue_index])) || (priv->rtllib->queue_stop)) { -RT_TRACE (COMP_FIRMWARE ,"===================> tx " -"full!\n" ); +RT_TRACE (COMP_FIRMWARE , +"===================> tx full!\n" );skb_queue_tail (&priv->rtllib->skb_waitQ [tcb_desc->queue_index], skb); }else {
@@ -197,8 +197,8 @@ static bool firmware_check_ready(struct net_device *dev,if (rt_status) pfirmware->firmware_status =FW_STATUS_3_TURNON_CPU ;else -RT_TRACE (COMP_FIRMWARE ,"CPUcheck_maincodeok_turnon" -"CPU fail!\n" ); +RT_TRACE (COMP_FIRMWARE , +"CPUcheck_maincodeok_turnonCPU fail!\n" );break ;
@@ -210,8 +210,9 @@ static bool firmware_check_ready(struct net_device *dev,if (rt_status) pfirmware->firmware_status =FW_STATUS_5_READY ;else -RT_TRACE (COMP_FIRMWARE ,"CPUcheck_firmware_ready fail" -"(%d)!\n" , rt_status); +RT_TRACE (COMP_FIRMWARE , +"CPUcheck_firmware_ready fail(%d)!\n" , + rt_status);break ;default :
@@ -246,8 +247,8 @@ bool init_firmware(struct net_device *dev) rst_opt =OPT_FIRMWARE_RESET ; starting_state =FW_INIT_STEP2_DATA ; }else { -RT_TRACE (COMP_FIRMWARE ,"PlatformInitFirmware: undefined" -" firmware state\n" ); +RT_TRACE (COMP_FIRMWARE , +"PlatformInitFirmware: undefined firmware state\n" ); } for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA;
@@ -266,14 +267,14 @@ bool init_firmware(struct net_device *dev) fw_name[init_step], &priv->pdev->dev);if (rc <0 ) { -RT_TRACE (COMP_FIRMWARE ,"request firmware fail!\n" ); +RT_TRACE (COMP_FIRMWARE , +"request firmware fail!\n" ); goto download_firmware_fail; }if (fw_entry->size >sizeof (pfirmware->firmware_buf[init_step])) { -RT_TRACE (COMP_FIRMWARE ,"img file size " -"exceed the container struct " -"buffer fail!\n" ); +RT_TRACE (COMP_FIRMWARE , +"img file size exceed the container struct buffer fail!\n" ); goto download_firmware_fail; }
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +106 -95
400 lines not on this page · raw message
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +10 -10
@@ -86,9 +86,9 @@ void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_device *ieee = priv->rtllib; -RT_TRACE (COMP_DBG ,"===========>%s():EntryNo is %d,KeyIndex is " -"%d,KeyType is %d,is_mesh is %d\n" , __func__, EntryNo, - KeyIndex, KeyType, is_mesh); +RT_TRACE (COMP_DBG , +"===========>%s():EntryNo is %d,KeyIndex is %d,KeyType is %d,is_mesh is %d\n" , + __func__, EntryNo, KeyIndex, KeyType, is_mesh);if (!is_mesh) { ieee->swcamtable[EntryNo].bused = true; ieee->swcamtable[EntryNo].key_index = KeyIndex;
@@ -127,9 +127,9 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,if (EntryNo >=TOTAL_CAM_ENTRY )RT_TRACE (COMP_ERR ,"cam entry exceeds in setKey()\n" ); -RT_TRACE (COMP_SEC ,"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d," -"KeyType:%d, MacAddr %pM\n" , dev, EntryNo, KeyIndex, - KeyType, MacAddr); +RT_TRACE (COMP_SEC , +"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d,KeyType:%d, MacAddr %pM\n" , + dev, EntryNo, KeyIndex, KeyType, MacAddr);if (DefaultKey) usConfig |=BIT15 | (KeyType<<2 );
@@ -244,8 +244,8 @@ void CamRestoreAllEntry(struct net_device *dev) (u32 *)(&priv->rtllib->swcamtable[0 ].key_buf[0 ]) ); }else { -RT_TRACE (COMP_ERR ,"===>%s():ERR!! ADHOC TKIP " -",but 0 entry is have no data\n" , +RT_TRACE (COMP_ERR , +"===>%s():ERR!! ADHOC TKIP ,but 0 entry is have no data\n" , __func__);return ; }
@@ -268,8 +268,8 @@ void CamRestoreAllEntry(struct net_device *dev)CAM_CONST_ADDR [0 ],0 , (u32 *)(&priv->rtllib->swcamtable[0].key_buf[0])); }else { -RT_TRACE (COMP_ERR ,"===>%s():ERR!! ADHOC CCMP ," -"but 0 entry is have no data\n" , +RT_TRACE (COMP_ERR , +"===>%s():ERR!! ADHOC CCMP ,but 0 entry is have no data\n" , __func__);return ; }
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +73 -67
312 lines not on this page · raw message
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +20 -16
@@ -757,8 +757,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)for (i =0 ; i < CCK_Table_length; i++) {if (TempCCk == (u32 )CCKSwingTable_Ch1_Ch13[i][0 ]) { priv->CCK_index = (u8 ) i; -RT_TRACE (COMP_POWER_TRACKING ,"Initial reg0x%x" -" = 0x%x, CCK_index = 0x%x\n" , +RT_TRACE (COMP_POWER_TRACKING , +"Initial reg0x%x = 0x%x, CCK_index = 0x%x\n" , rCCK0_TxFilter1, TempCCk, priv->CCK_index);break ;
@@ -803,8 +803,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) priv->Record_CCK_20Mindex = tmpCCK20Mindex; priv->Record_CCK_40Mindex = tmpCCK40Mindex; -RT_TRACE (COMP_POWER_TRACKING ,"Record_CCK_20Mindex / Record_CCK_40" -"Mindex = %d / %d.\n" , +RT_TRACE (COMP_POWER_TRACKING , +"Record_CCK_20Mindex / Record_CCK_40Mindex = %d / %d.\n" , priv->Record_CCK_20Mindex, priv->Record_CCK_40Mindex); if (priv->rtllib->current_network.channel == 14 &&
@@ -2131,8 +2131,8 @@ static void dm_check_edca_turbo(struct net_device *dev)static int wb_tmp;if (wb_tmp ==0 ) { -printk (KERN_INFO "%s():iot peer is %s, bssid:" -" %pM\n" , __func__, +printk (KERN_INFO +"%s():iot peer is %s, bssid: %pM\n" , __func__, peername[pHTInfo->IOTPeer], priv->rtllib->current_network.bssid); wb_tmp =1 ;
@@ -2638,9 +2638,10 @@ void dm_fsync_timer_callback(unsigned long data) } priv->rate_record = rate_count; priv->rateCountDiffRecord = rate_count_diff; -RT_TRACE (COMP_HALDM ,"rateRecord %d rateCount %d, rate" -"Countdiff %d bSwitchFsync %d\n" , priv->rate_record, - rate_count, rate_count_diff, priv->bswitch_fsync); +RT_TRACE (COMP_HALDM , +"rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n" , + priv->rate_record, rate_count, rate_count_diff, + priv->bswitch_fsync);if (priv->undecorated_smoothed_pwdb > priv->rtllib->fsync_rssi_threshold && bSwitchFromCountDiff) {
@@ -2685,9 +2686,10 @@ void dm_fsync_timer_callback(unsigned long data)write_nic_dword (dev, rOFDM0_RxDetector2,0x465c52cd ); }RT_TRACE (COMP_HALDM ,"ContinueDiffCount %d\n" , priv->ContinueDiffCount); -RT_TRACE (COMP_HALDM ,"rateRecord %d rateCount %d, rateCountdiff %d " -"bSwitchFsync %d\n" , priv->rate_record, rate_count, - rate_count_diff, priv->bswitch_fsync); +RT_TRACE (COMP_HALDM , +"rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n" , + priv->rate_record, rate_count, rate_count_diff, + priv->bswitch_fsync); }static void dm_StartHWFsync (struct net_device *dev)
@@ -2778,12 +2780,14 @@ void dm_check_fsync(struct net_device *dev)static u8 reg_c38_State = RegC38_Default;static u32 reset_cnt; -RT_TRACE (COMP_HALDM ,"RSSI %d TimeInterval %d MultipleTimeInterval " -"%d\n" , priv->rtllib->fsync_rssi_threshold, +RT_TRACE (COMP_HALDM , +"RSSI %d TimeInterval %d MultipleTimeInterval %d\n" , + priv->rtllib->fsync_rssi_threshold, priv->rtllib->fsync_time_interval, priv->rtllib->fsync_multiple_timeinterval); -RT_TRACE (COMP_HALDM ,"RateBitmap 0x%x FirstDiffRateThreshold %d Second" -"DiffRateThreshold %d\n" , priv->rtllib->fsync_rate_bitmap, +RT_TRACE (COMP_HALDM , +"RateBitmap 0x%x FirstDiffRateThreshold %d SecondDiffRateThreshold %d\n" , + priv->rtllib->fsync_rate_bitmap, priv->rtllib->fsync_firstdiff_ratethreshold, priv->rtllib->fsync_seconddiff_ratethreshold);
drivers/staging/rtl8192e/rtl8192e/rtl_pci.c +11 -7
@@ -65,13 +65,15 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev)if (DeviceID ==0x8172 ) {switch (RevisionID) {case HAL_HW_PCI_REVISION_ID_8192PCIE : -printk (KERN_INFO "Adapter(8192 PCI-E) is found - " -"DeviceID=%x\n" , DeviceID); +printk (KERN_INFO +"Adapter(8192 PCI-E) is found - DeviceID=%x\n" , + DeviceID); priv->card_8192 =NIC_8192E ;break ;case HAL_HW_PCI_REVISION_ID_8192SE : -printk (KERN_INFO "Adapter(8192SE) is found - " -"DeviceID=%x\n" , DeviceID); +printk (KERN_INFO +"Adapter(8192SE) is found - DeviceID=%x\n" , + DeviceID); priv->card_8192 =NIC_8192SE ;break ;default :
@@ -83,9 +85,11 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev) }if (priv->ops->nic_type != priv->card_8192) { -printk (KERN_INFO "Detect info(%x) and hardware info(%x) not match!\n" , - priv->ops->nic_type, priv->card_8192); -printk (KERN_INFO "Please select proper driver before install!!!!\n" ); +printk (KERN_INFO +"Detect info(%x) and hardware info(%x) not match!\n" , + priv->ops->nic_type, priv->card_8192); +printk (KERN_INFO +"Please select proper driver before install!!!!\n" );return false; }
drivers/staging/rtl8192e/rtl8192e/rtl_pm.c +6 -6
@@ -35,8 +35,8 @@ int rtl8192E_suspend(struct pci_dev *pdev, pm_message_t state) priv->polling_timer_on =0 ;if (!netif_running (dev)) { -printk (KERN_INFO "RTL819XE:UI is open out of suspend " -"function\n" ); +printk (KERN_INFO +"RTL819XE:UI is open out of suspend function\n" ); goto out_pci_suspend; }
@@ -59,8 +59,8 @@ int rtl8192E_suspend(struct pci_dev *pdev, pm_message_t state) out_pci_suspend:printk ("r8192E support WOL call??????????????????????\n" );if (priv->rtllib->bSupportRemoteWakeUp) -RT_TRACE (COMP_POWER ,"r8192E support WOL call!!!!!!!" -"!!!!!!!!!!!.\n" ); +RT_TRACE (COMP_POWER , +"r8192E support WOL call!!!!!!!!!!!!!!!!!!.\n" );pci_save_state (pdev);pci_disable_device (pdev); pci_enable_wake(pdev, pci_choose_state(pdev, state),
@@ -101,8 +101,8 @@ int rtl8192E_resume(struct pci_dev *pdev)check_rfctrl_gpio_timer ((unsigned long )dev);if (!netif_running (dev)) { -printk (KERN_INFO "RTL819XE:UI is open out of resume " -"function\n" ); +printk (KERN_INFO +"RTL819XE:UI is open out of resume function\n" ); goto out; }
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +12 -12
@@ -37,8 +37,8 @@ static void rtl8192_hw_sleep_down(struct net_device *dev)spin_lock_irqsave (&priv->rf_ps_lock, flags);if (priv->RFChangeInProgress) {spin_unlock_irqrestore (&priv->rf_ps_lock, flags); -RT_TRACE (COMP_DBG ,"rtl8192_hw_sleep_down(): RF Change in " -"progress!\n" ); +RT_TRACE (COMP_DBG , +"rtl8192_hw_sleep_down(): RF Change in progress!\n" );return ; }spin_unlock_irqrestore (&priv->rf_ps_lock, flags);
@@ -64,8 +64,8 @@ void rtl8192_hw_wakeup(struct net_device *dev)spin_lock_irqsave (&priv->rf_ps_lock, flags);if (priv->RFChangeInProgress) {spin_unlock_irqrestore (&priv->rf_ps_lock, flags); -RT_TRACE (COMP_DBG ,"rtl8192_hw_wakeup(): RF Change in " -"progress!\n" ); +RT_TRACE (COMP_DBG , +"rtl8192_hw_wakeup(): RF Change in progress!\n" );queue_delayed_work_rsl (priv->rtllib->wq, &priv->rtllib->hw_wakeup_wq,MSECS (10 ));return ;
@@ -239,8 +239,8 @@ static bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev, priv->rtllib->sta_sleep =LPS_IS_WAKE ;spin_lock_irqsave (&(priv->rtllib->mgmt_tx_lock), flags); -RT_TRACE (COMP_DBG ,"LPS leave: notify AP we are awaked" -" ++++++++++ SendNullFunctionData\n" ); +RT_TRACE (COMP_DBG , +"LPS leave: notify AP we are awaked ++++++++++ SendNullFunctionData\n" );rtllib_sta_ps_send_null_frame (priv->rtllib,0 );spin_unlock_irqrestore (&(priv->rtllib->mgmt_tx_lock), flags); }
@@ -255,8 +255,8 @@ void LeisurePSEnter(struct net_device *dev) &(priv->rtllib->PowerSaveControl);RT_TRACE (COMP_PS ,"LeisurePSEnter()...\n" ); -RT_TRACE (COMP_PS ,"pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdle" -"Count is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n" , +RT_TRACE (COMP_PS , +"pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdleCount is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n" , pPSC->bLeisurePs, priv->rtllib->ps, pPSC->LpsIdleCount,RT_CHECK_FOR_HANG_PERIOD );
@@ -271,8 +271,8 @@ void LeisurePSEnter(struct net_device *dev)if (priv->rtllib->ps ==RTLLIB_PS_DISABLED ) { -RT_TRACE (COMP_LPS ,"LeisurePSEnter(): Enter " -"802.11 power save mode...\n" ); +RT_TRACE (COMP_LPS , +"LeisurePSEnter(): Enter 802.11 power save mode...\n" );if (!pPSC->bFwCtrlLPS) {if (priv->rtllib->SetFwCmdHandler)
@@ -301,8 +301,8 @@ void LeisurePSLeave(struct net_device *dev)if (pPSC->bLeisurePs) {if (priv->rtllib->ps !=RTLLIB_PS_DISABLED ) { -RT_TRACE (COMP_LPS ,"LeisurePSLeave(): Busy Traffic , " -"Leave 802.11 power save..\n" ); +RT_TRACE (COMP_LPS , +"LeisurePSLeave(): Busy Traffic , Leave 802.11 power save..\n" );MgntActSet_802_11_PowerSaveMode (dev,RTLLIB_PS_DISABLED );
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +21 -14
@@ -116,8 +116,9 @@ static int r8192_wx_set_power(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev);if (priv->bHwRadioOff == true) { -RT_TRACE (COMP_ERR ,"%s():Hw is Radio Off, we can't set " -"Power,return\n" , __func__); +RT_TRACE (COMP_ERR , +"%s():Hw is Radio Off, we can't set Power,return\n" , + __func__);return 0 ; }down (&priv->wx_sem);
@@ -256,8 +257,9 @@ static int r8192se_wx_set_radio(struct net_device *dev,printk (KERN_INFO "%s(): set radio ! extra is %d\n" , __func__, *extra);if ((*extra !=0 ) && (*extra !=1 )) { -RT_TRACE (COMP_ERR ,"%s(): set radio an err value,must 0(radio " -"off) or 1(radio on)\n" , __func__); +RT_TRACE (COMP_ERR , +"%s(): set radio an err value,must 0(radio off) or 1(radio on)\n" , + __func__);up (&priv->wx_sem);return -1 ; }
@@ -293,8 +295,9 @@ static int r8192se_wx_set_force_lps(struct net_device *dev,down (&priv->wx_sem); -printk (KERN_INFO "%s(): force LPS ! extra is %d (1 is open 0 is " -"close)\n" , __func__, *extra); +printk (KERN_INFO +"%s(): force LPS ! extra is %d (1 is open 0 is close)\n" , + __func__, *extra); priv->force_lps = *extra;up (&priv->wx_sem);return 0 ;
@@ -344,8 +347,9 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,up (&priv->wx_sem);return -1 ; }else { -printk (KERN_INFO "=========>%s(): " -"IPSLeave\n" , __func__); +printk (KERN_INFO +"=========>%s(): IPSLeave\n" , + __func__);down (&priv->rtllib->ips_sem);IPSLeave (dev);up (&priv->rtllib->ips_sem);
@@ -500,13 +504,15 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,if (rtState == eRfOff) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) { -RT_TRACE (COMP_ERR ,"%s(): RF is " -"OFF.\n" , __func__); +RT_TRACE (COMP_ERR , +"%s(): RF is OFF.\n" , + __func__);up (&priv->wx_sem);return -1 ; }else { -RT_TRACE (COMP_PS ,"=========>%s(): " -"IPSLeave\n" , __func__); +RT_TRACE (COMP_PS , +"=========>%s(): IPSLeave\n" , + __func__);down (&priv->rtllib->ips_sem);IPSLeave (dev);up (&priv->rtllib->ips_sem);
@@ -577,8 +583,9 @@ static int r8192_wx_set_essid(struct net_device *dev, ;/* TODO - get rid of if */ }if (priv->bHwRadioOff == true) { -printk (KERN_INFO "=========>%s():hw radio off,or Rf state is " -"eRfOff, return\n" , __func__); +printk (KERN_INFO +"=========>%s():hw radio off,or Rf state is eRfOff, return\n" , + __func__);return 0 ; }down (&priv->wx_sem);
drivers/staging/rtl8192e/rtl819x_BAProc.c +41 -36
173 lines not on this page · raw message
drivers/staging/rtl8192e/rtl819x_HTProc.c +23 -21
104 lines not on this page · raw message
drivers/staging/rtl8192e/rtl819x_TSProc.c +26 -27
116 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_crypt.c +8 -6
@@ -62,8 +62,9 @@ void rtllib_crypt_deinit_handler(unsigned long data)spin_lock_irqsave (info->lock, flags);rtllib_crypt_deinit_entries (info,0 );if (!list_empty (&info->crypt_deinit_list)) { -printk (KERN_DEBUG "%s: entries remaining in delayed crypt " -"deletion list\n" , info->name); +printk (KERN_DEBUG +"%s: entries remaining in delayed crypt deletion list\n" , + info->name); info->crypt_deinit_timer.expires = jiffies +HZ ;add_timer (&info->crypt_deinit_timer); }
@@ -145,8 +146,8 @@ int rtllib_unregister_crypto_ops(struct lib80211_crypto_ops *ops)spin_unlock_irqrestore (&hcrypt->lock, flags);if (del_alg) { -printk (KERN_DEBUG "rtllib_crypt: unregistered algorithm " -"'%s'\n" , ops->name); +printk (KERN_DEBUG "rtllib_crypt: unregistered algorithm '%s'\n" , + ops->name);kfree (del_alg); }
@@ -237,8 +238,9 @@ void __exit rtllib_crypto_deinit(void)struct rtllib_crypto_alg *alg = (struct rtllib_crypto_alg *) ptr;list_del (ptr); -printk (KERN_DEBUG "rtllib_crypt: unregistered algorithm " -"'%s' (deinit)\n" , alg->ops->name); +printk (KERN_DEBUG +"rtllib_crypt: unregistered algorithm '%s' (deinit)\n" , + alg->ops->name);kfree (alg); }
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +10 -14
@@ -69,8 +69,7 @@ static void *rtllib_ccmp_init(int key_idx) priv->tfm = (void *)crypto_alloc_cipher ("aes" ,0 ,CRYPTO_ALG_ASYNC );if (IS_ERR (priv->tfm)) { -pr_debug ("rtllib_crypt_ccmp: could not allocate " -"crypto API aes\n" ); +pr_debug ("rtllib_crypt_ccmp: could not allocate crypto API aes\n" ); priv->tfm =NULL ; goto fail; }
@@ -278,23 +277,22 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) keyidx = pos[3 ];if (!(keyidx & (1 <<5 ))) {if (net_ratelimit ()) { -pr_debug ("CCMP: received packet without ExtIV" -" flag from %pM\n" , hdr->addr2); +pr_debug ("CCMP: received packet without ExtIV flag from %pM\n" , + hdr->addr2); } key->dot11RSNAStatsCCMPFormatErrors++;return -2 ; } keyidx >>=6 ;if (key->key_idx != keyidx) { -pr_debug ("CCMP: RX tkey->key_idx=%d frame " -"keyidx=%d priv=%p\n" , key->key_idx, keyidx, priv); +pr_debug ("CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n" , + key->key_idx, keyidx, priv);return -6 ; }if (!key->key_set) {if (net_ratelimit ()) { -pr_debug ("CCMP: received packet from %pM" -" with keyid=%d that does not have a configured" -" key\n" , hdr->addr2, keyidx); +pr_debug ("CCMP: received packet from %pM with keyid=%d that does not have a configured key\n" , + hdr->addr2, keyidx); }return -3 ; }
@@ -341,8 +339,8 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)if (memcmp (mic, a,CCMP_MIC_LEN ) !=0 ) {if (net_ratelimit ()) { -pr_debug ("CCMP: decrypt failed: STA=" -" %pM\n" , hdr->addr2); +pr_debug ("CCMP: decrypt failed: STA= %pM\n" , + hdr->addr2); } key->dot11RSNAStatsCCMPDecryptErrors++;return -5 ;
@@ -419,9 +417,7 @@ static void rtllib_ccmp_print_stats(struct seq_file *m, void *priv)struct rtllib_ccmp_data *ccmp = priv; seq_printf(m, - "key[%d] alg=CCMP key_set=%d " - "tx_pn=%pM rx_pn=%pM " - "format_errors=%d replays=%d decrypt_errors=%d\n", + "key[%d] alg=CCMP key_set=%d tx_pn=%pM rx_pn=%pM format_errors=%d replays=%d decrypt_errors=%d\n", ccmp->key_idx, ccmp->key_set, ccmp->tx_pn, ccmp->rx_pn, ccmp->dot11RSNAStatsCCMPFormatErrors,
drivers/staging/rtl8192e/rtllib_crypt_tkip.c +31 -31
137 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_crypt_wep.c +5 -7
@@ -44,15 +44,13 @@ static void *prism2_wep_init(int keyidx) priv->tx_tfm =crypto_alloc_blkcipher ("ecb(arc4)" ,0 ,CRYPTO_ALG_ASYNC );if (IS_ERR (priv->tx_tfm)) { -pr_debug ("rtllib_crypt_wep: could not allocate " -"crypto API arc4\n" ); +pr_debug ("rtllib_crypt_wep: could not allocate crypto API arc4\n" ); priv->tx_tfm =NULL ; goto fail; } priv->rx_tfm =crypto_alloc_blkcipher ("ecb(arc4)" ,0 ,CRYPTO_ALG_ASYNC );if (IS_ERR (priv->rx_tfm)) { -pr_debug ("rtllib_crypt_wep: could not allocate " -"crypto API arc4\n" ); +pr_debug ("rtllib_crypt_wep: could not allocate crypto API arc4\n" ); priv->rx_tfm =NULL ; goto fail; }
@@ -108,9 +106,9 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)if (skb_headroom (skb) <4 ||skb_tailroom (skb) <4 || skb->len < hdr_len){ -printk (KERN_ERR "Error!!! headroom=%d tailroom=%d skblen=%d" -" hdr_len=%d\n" ,skb_headroom (skb),skb_tailroom (skb), - skb->len, hdr_len); +printk (KERN_ERR +"Error!!! headroom=%d tailroom=%d skblen=%d hdr_len=%d\n" , +skb_headroom (skb),skb_tailroom (skb), skb->len, hdr_len);return -1 ; } len = skb->len - hdr_len;
drivers/staging/rtl8192e/rtllib_softmac.c +32 -29
134 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_softmac_wx.c +3 -2
@@ -575,8 +575,9 @@ int rtllib_wx_set_power(struct rtllib_device *ieee,if ((!ieee->sta_wake_up) || (!ieee->enter_sleep_state) || (!ieee->ps_is_queue_empty)) { -RTLLIB_DEBUG (RTLLIB_DL_ERR ,"%s(): PS mode is tried to be use " -"but driver missed a callback\n\n" , __func__); +RTLLIB_DEBUG (RTLLIB_DL_ERR , +"%s(): PS mode is tried to be use but driver missed a callback\n\n" , + __func__);return -1 ; }
drivers/staging/rtl8192e/rtllib_tx.c +4 -4
@@ -604,8 +604,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)if (ieee->iw_mode ==IW_MODE_MONITOR ) { txb =rtllib_alloc_txb (1 , skb->len,GFP_ATOMIC );if (unlikely (!txb)) { -printk (KERN_WARNING "%s: Could not allocate " -"TXB\n" , +printk (KERN_WARNING +"%s: Could not allocate TXB\n" , ieee->dev->name); goto failed; }
@@ -636,8 +636,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) } } }else if (ETH_P_ARP == ether_type) { -printk (KERN_INFO "=================>DHCP " -"Protocol start tx ARP pkt!!\n" ); +printk (KERN_INFO +"=================>DHCP Protocol start tx ARP pkt!!\n" ); bdhcp = true; ieee->LPSDelayCnt = ieee->current_network.tim.tim_count;
drivers/staging/rtl8192e/rtllib_wx.c +3 -4
@@ -282,8 +282,7 @@ int rtllib_wx_get_scan(struct rtllib_device *ieee, ev =rtl819x_translate_scan (ieee, ev, stop, network, info); else - RTLLIB_DEBUG_SCAN("Not showing network '%s (" -" %pM)' due to age (%lums).\n" , + RTLLIB_DEBUG_SCAN("Not showing network '%s ( %pM)' due to age (%lums).\n",escape_essid (network->ssid, network->ssid_len), network->bssid,
@@ -437,8 +436,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,/* No key data - just set the default TX key index */ if (key_provided) { -RTLLIB_DEBUG_WX ( -"Setting key %d to default Tx key.\n" , key); +RTLLIB_DEBUG_WX ("Setting key %d to default Tx key.\n" , + key); ieee->crypt_info.tx_keyidx = key; sec.active_key = key; sec.flags |=SEC_ACTIVE_KEY ;
Signature · 1 line
1.8.4.1
Re: [PATCH v3 1/6] staging: rtl8192e: fix coding style issues (merge broken strings)
On Fri, 2015-03-13 at 00:53 +0100, Mateusz Kulikowski wrote:
[]
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c void PHY_SetRF8256Bandwidth(struct net_device *dev, · line 51
Quoted 12 lines
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +2
-2@@ -47,8 +47,8 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, 0x0e, bMask12Bits, 0x021); }else { -RT_TRACE (COMP_ERR ,"PHY_SetRF8256Bandwidth(): " -"unknown hardware version\n" ); +RT_TRACE (COMP_ERR , +"PHY_SetRF8256Bandwidth(): unknown hardware version\n" );
Another thing you might consider is to change these embedded function names in another patch to use
"%s: ", __func__ RT_TRACE(COMP_ERR, "%s: "unknown hardware version\n", __func__)
There's a cocci script for that.
http://cocci.systeme.lip6.narkive.com/nKXf6Bmy/finding-embedded-function-names
Re: [PATCH v3 1/6] staging: rtl8192e: fix coding style issues (merge broken strings)
Quoted 11 lines · Joe Perches
Another thing you might consider is to change these embedded function names in another patch to use
"%s: ", __func__ RT_TRACE(COMP_ERR, "%s: "unknown hardware version\n", __func__)There's a cocci script for that.
http://cocci.systeme.lip6.narkive.com/nKXf6Bmy/finding-embedded-function-names
This tool (coccinelle) looks great - I will once take look at it and do swap like suggested;
It probably can be used to cleanup other parts of this driver as well - if I knew about it earlier it would save me a lot of repetitive work.
Regards,
Mateusz
Re: [PATCH v3 1/6] staging: rtl8192e: fix coding style issues (merge broken strings)
Quoted 10 lines · Mateusz Kulikowski
Quoted 9 lines · Joe Perches
Another thing you might consider is to change these embedded function names in another patch to use
"%s: ", __func__ RT_TRACE(COMP_ERR, "%s: "unknown hardware version\n", __func__)
Quoted 5 lines
Quoted 2 lines
There's a cocci script for that.
http://cocci.systeme.lip6.narkive.com/nKXf6Bmy/finding-embedded-function-namesThis tool (coccinelle) looks great - I will once take look at it and do swap like suggested;
It probably can be used to cleanup other parts of this driver as well - if I knew about it earlier it would save me a lot of repetitive work.
Coccinelle is a very useful tool.
Another thing that can save typing is using scripts/checkpatch.pl with the --fix (or --fix-inplace) option with various --types=<foo>.
There is a trivial script that can help
https://lkml.org/lkml/2014/7/11/794
Re: [PATCH v3 1/6] staging: rtl8192e: fix coding style issues (merge broken strings)
In reply to Mateusz Kulikowskidrivers/staging/rtl8192e/rtl8192e/r8192E_dev.c static u8 HwRateToMRate90(bool bIsHT, u8 rate) · line 1369
Quoted 11 lines · Mateusz Kulikowski
- 'WARNING: break quoted strings at a space character'
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +2
-3@@ -1361,9 +1365,10 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)break ;default : -RT_TRACE (COMP_RECV ,"HwRateToMRate90(): Non supported" -"Rate [%x], bIsHT = %d!!!\n" , rate, bIsHT); -break ; + RT_TRACE(COMP_RECV, + "HwRateToMRate90(): Non supportedRate [%x], bIsHT = %d!!!\n",
There should be a space character between "supported" and "Rate". You can fix it in a later patch though, it's minor. And really no one cares about RT_TRACE() output.
regards,
dan carpenter
Re: [PATCH v3 1/6] staging: rtl8192e: fix coding style issues (merge broken strings)
Quoted 10 lines · Dan Carpenter
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c static u8 HwRateToMRate90(bool bIsHT, u8 rate) · line 1369
Quoted 5 lines · Mateusz Kulikowski
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +2
-3-RT_TRACE (COMP_RECV ,"HwRateToMRate90(): Non supported" -"Rate [%x], bIsHT = %d!!!\n" , rate, bIsHT); -break ; + RT_TRACE(COMP_RECV, + "HwRateToMRate90(): Non supportedRate [%x], bIsHT = %d!!!\n",There should be a space character between "supported" and "Rate". You can fix it in a later patch though, it's minor. And really no one cares about
RT_TRACE()output.
Thanks for the hint - there is a lot of other typos in messages - I will probably fix them later on;
As for RT_TRACE - my plan is to replace the whole "proprietary logging system" with dynamic debug (i.e. netdev_dbg() or pr_debug()), but again - this is bigger patch and I'll prepare it after this series is merged.
Regards,
Mateusz
PATCH v3 2/6 staging: rtl8192e: fix coding style issues (replace min with min_t)
In reply to Mateusz KulikowskiFix checkpatch.pl warning 'min() should probably be min_t()'.
--- drivers/staging/rtl8192e/rtllib_rx.c | 16 +++++++++++----- drivers/staging/rtl8192e/rtllib_wx.c | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-)
drivers/staging/rtl8192e/rtllib_rx.c +11 -5
@@ -1908,7 +1908,9 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, info_element->data[2] == 0x4c && info_element->data[3] == 0x033) { - tmp_htcap_len =min (info_element->len, (u8 )MAX_IE_LEN ); + tmp_htcap_len =min_t (u8, + info_element->len, +MAX_IE_LEN );if (tmp_htcap_len !=0 ) { network->bssht.bdHTSpecVer =HT_SPEC_VER_EWC ; network->bssht.bdHTCapLen = tmp_htcap_len > sizeof(network->bssht.bdHTCapBuf) ?
@@ -1932,7 +1934,9 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, info_element->data[1] == 0x90 && info_element->data[2] == 0x4c && info_element->data[3] == 0x034) { - tmp_htinfo_len =min (info_element->len, (u8 )MAX_IE_LEN ); + tmp_htinfo_len =min_t (u8, + info_element->len, +MAX_IE_LEN );if (tmp_htinfo_len !=0 ) { network->bssht.bdHTSpecVer =HT_SPEC_VER_EWC ;if (tmp_htinfo_len) {
@@ -1953,7 +1957,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, info_element->data[1] == 0xe0 && info_element->data[2] == 0x4c && info_element->data[3] == 0x02) { - ht_realtek_agg_len =min (info_element->len, (u8 )MAX_IE_LEN ); + ht_realtek_agg_len =min_t (u8, info_element->len,MAX_IE_LEN );memcpy (ht_realtek_agg_buf, info_element->data, info_element->len); }if (ht_realtek_agg_len >=5 ) {
@@ -2083,7 +2087,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,case MFIE_TYPE_HT_CAP :RTLLIB_DEBUG_SCAN ("MFIE_TYPE_HT_CAP: %d bytes\n" , info_element->len); - tmp_htcap_len =min (info_element->len, (u8 )MAX_IE_LEN ); + tmp_htcap_len =min_t (u8, info_element->len, +MAX_IE_LEN );if (tmp_htcap_len !=0 ) { network->bssht.bdHTSpecVer =HT_SPEC_VER_EWC ; network->bssht.bdHTCapLen = tmp_htcap_len > sizeof(network->bssht.bdHTCapBuf) ?
@@ -2110,7 +2115,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,case MFIE_TYPE_HT_INFO :RTLLIB_DEBUG_SCAN ("MFIE_TYPE_HT_INFO: %d bytes\n" , info_element->len); - tmp_htinfo_len =min (info_element->len, (u8 )MAX_IE_LEN ); + tmp_htinfo_len =min_t (u8, info_element->len, +MAX_IE_LEN );if (tmp_htinfo_len) { network->bssht.bdHTSpecVer =HT_SPEC_VER_IEEE ; network->bssht.bdHTInfoLen = tmp_htinfo_len >
drivers/staging/rtl8192e/rtllib_wx.c +2 -2
@@ -74,7 +74,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.cmd =SIOCGIWESSID ; iwe.u.data.flags =1 ;if (network->ssid_len >0 ) { - iwe.u.data.length =min (network->ssid_len, (u8 )32 ); + iwe.u.data.length =min_t (u8, network->ssid_len,32 ); start =iwe_stream_add_point_rsl (info, start, stop, &iwe, network->ssid); }else if (network->hidden_ssid_len ==0 ) {
@@ -82,7 +82,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, start =iwe_stream_add_point_rsl (info, start, stop, &iwe,"<hidden>" ); }else { - iwe.u.data.length =min (network->hidden_ssid_len, (u8 )32 ); + iwe.u.data.length =min_t (u8, network->hidden_ssid_len,32 ); start =iwe_stream_add_point_rsl (info, start, stop, &iwe, network->hidden_ssid); }
Signature · 1 line
1.8.4.1
PATCH v3 3/6 staging: rtl8192e: fix coding style issues (spaces before semicolon)
In reply to Mateusz KulikowskiFix checkpatch.pl warning 'space prohibited before semicolon'.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtllib.h | 4 ++-- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +1 -1
@@ -46,7 +46,7 @@ bool cmpk_message_handle_tx( do { if ((buffer_len - frag_offset) > frag_threshold) { - frag_length = frag_threshold ; + frag_length = frag_threshold; bLastIniPkt = 0; } else {
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +1 -1
@@ -51,7 +51,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, frag_threshold = pfirmware->cmdpacket_frag_thresold; do { if ((buffer_len - frag_offset) > frag_threshold) { - frag_length = frag_threshold ; + frag_length = frag_threshold; bLastIniPkt = 0; } else {
drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h +7 -7
@@ -34,18 +34,18 @@ extern u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE];#define PHY_REG_1T2RArrayLengthPciE 296extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE];#define RadioA_ArrayLengthPciE 246 -extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] ; +extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE];#define RadioB_ArrayLengthPciE 78 -extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] ; +extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE];#define RadioC_ArrayLengthPciE 2 -extern u32 Rtl8192PciERadioC_Array[RadioC_ArrayLengthPciE] ; +extern u32 Rtl8192PciERadioC_Array[RadioC_ArrayLengthPciE];#define RadioD_ArrayLengthPciE 2 -extern u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE] ; +extern u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE];#define MACPHY_ArrayLengthPciE 18 -extern u32 Rtl8192PciEMACPHY_Array[MACPHY_ArrayLengthPciE] ; +extern u32 Rtl8192PciEMACPHY_Array[MACPHY_ArrayLengthPciE];#define MACPHY_Array_PGLengthPciE 30 -extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE] ; +extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE];#define AGCTAB_ArrayLengthPciE 384 -extern u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE] ; +extern u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE];#endif
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +1 -1
@@ -115,7 +115,7 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) {RT_TRACE (COMP_ERR ,"%s(): RF is OFF.\n" , __func__); -return ; +return ; }else {down (&priv->rtllib->ips_sem);IPSLeave (dev);
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -1
@@ -2987,7 +2987,7 @@ err_pci_disable:static void rtl8192_pci_disconnect (struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); -struct r8192_priv *priv ; +struct r8192_priv *priv;u32 i;if (dev) {
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +2 -2
@@ -1004,14 +1004,14 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb);u8 read_nic_io_byte (struct net_device *dev,int x);u32 read_nic_io_dword (struct net_device *dev,int x); -u16 read_nic_io_word (struct net_device *dev,int x) ; +u16 read_nic_io_word (struct net_device *dev,int x);void write_nic_io_byte (struct net_device *dev,int x,u8 y);void write_nic_io_word (struct net_device *dev,int x,u16 y);void write_nic_io_dword (struct net_device *dev,int x,u32 y);u8 read_nic_byte (struct net_device *dev,int x);u32 read_nic_dword (struct net_device *dev,int x); -u16 read_nic_word (struct net_device *dev,int x) ; +u16 read_nic_word (struct net_device *dev,int x);void write_nic_byte (struct net_device *dev,int x,u8 y);void write_nic_word (struct net_device *dev,int x,u16 y);void write_nic_dword (struct net_device *dev,int x,u32 y);
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +8 -8
@@ -1446,7 +1446,7 @@ static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14) TempVal =0 ;if (!bInCH14) { TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[0 ] + - (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[1 ]<<8 )) ; + (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[1 ]<<8 ));rtl8192_setBBreg (dev, rCCK0_TxFilter1, bMaskHWord, TempVal); TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[2] +
@@ -1455,12 +1455,12 @@ static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14) (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[5]<<24));rtl8192_setBBreg (dev, rCCK0_TxFilter2, bMaskDWord, TempVal); TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[6 ] + - (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[7 ]<<8 )) ; + (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[7 ]<<8 ));rtl8192_setBBreg (dev, rCCK0_DebugPort, bMaskLWord, TempVal); }else { TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[0 ] + - (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[1 ]<<8 )) ; + (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[1 ]<<8 ));rtl8192_setBBreg (dev, rCCK0_TxFilter1, bMaskHWord, TempVal); TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[2] +
@@ -1469,7 +1469,7 @@ static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14) (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[5]<<24));rtl8192_setBBreg (dev, rCCK0_TxFilter2, bMaskDWord, TempVal); TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[6 ] + - (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[7 ]<<8 )) ; + (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[7 ]<<8 ));rtl8192_setBBreg (dev, rCCK0_DebugPort, bMaskLWord, TempVal); }
@@ -1485,7 +1485,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH TempVal =0 ;if (!bInCH14) { TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][0 ] + - (CCKSwingTable_Ch1_Ch13[priv->CCK_index][1 ]<<8 ) ; + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][1 ]<<8 );rtl8192_setBBreg (dev, rCCK0_TxFilter1, bMaskHWord, TempVal);RT_TRACE (COMP_POWER_TRACKING ,"CCK not chnl 14, reg 0x%x = 0x%x\n" , rCCK0_TxFilter1, TempVal);
@@ -1497,14 +1497,14 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCHRT_TRACE (COMP_POWER_TRACKING ,"CCK not chnl 14, reg 0x%x = 0x%x\n" , rCCK0_TxFilter2, TempVal); TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][6 ] + - (CCKSwingTable_Ch1_Ch13[priv->CCK_index][7 ]<<8 ) ; + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][7 ]<<8 );rtl8192_setBBreg (dev, rCCK0_DebugPort, bMaskLWord, TempVal);RT_TRACE (COMP_POWER_TRACKING ,"CCK not chnl 14, reg 0x%x = 0x%x\n" , rCCK0_DebugPort, TempVal); }else { TempVal = CCKSwingTable_Ch14[priv->CCK_index][0 ] + - (CCKSwingTable_Ch14[priv->CCK_index][1 ]<<8 ) ; + (CCKSwingTable_Ch14[priv->CCK_index][1 ]<<8 );rtl8192_setBBreg (dev, rCCK0_TxFilter1, bMaskHWord, TempVal); RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x = 0x%x\n",
@@ -1517,7 +1517,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCHRT_TRACE (COMP_POWER_TRACKING ,"CCK chnl 14, reg 0x%x = 0x%x\n" , rCCK0_TxFilter2, TempVal); TempVal = CCKSwingTable_Ch14[priv->CCK_index][6 ] + - (CCKSwingTable_Ch14[priv->CCK_index][7 ]<<8 ) ; + (CCKSwingTable_Ch14[priv->CCK_index][7 ]<<8 );rtl8192_setBBreg (dev, rCCK0_DebugPort, bMaskLWord, TempVal); RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x = 0x%x\n",
drivers/staging/rtl8192e/rtllib.h +2 -2
@@ -2276,7 +2276,7 @@ struct rtllib_device {short raw_tx;/* used if IEEE_SOFTMAC_TX_QUEUE is set */ short queue_stop; -short scanning_continue ; +short scanning_continue;short proto_started;short proto_stoppping;
@@ -2906,7 +2906,7 @@ extern void HT_update_self_and_peer_setting(struct rtllib_device *ieee,extern u8 HTGetHighestMCSRate (struct rtllib_device *ieee,u8 *pMCSRateSet,u8 *pMCSFilter);extern u8 MCS_FILTER_ALL []; -extern u16 MCS_DATA_RATE [2 ][2 ][77 ] ; +extern u16 MCS_DATA_RATE [2 ][2 ][77 ];extern u8 HTCCheck (struct rtllib_device *ieee,u8 *pFrame);extern void HTResetIOTSetting (struct rt_hi_throughput *pHTInfo);extern bool IsHTHalfNmodeAPs (struct rtllib_device *ieee);
drivers/staging/rtl8192e/rtllib_rx.c +1 -1
@@ -1182,7 +1182,7 @@ static void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee,if (rxb ==NULL ) {printk (KERN_INFO "%s: rxb is NULL!!\n" , __func__); -return ; +return ; }for (i =0 ; i < rxb->nr_subframes; i++) {
drivers/staging/rtl8192e/rtllib_softmac.c +1 -1
@@ -1476,7 +1476,7 @@ static void rtllib_associate_step1(struct rtllib_device *ieee, u8 *daddr)if (!skb)rtllib_associate_abort (ieee);else { - ieee->state =RTLLIB_ASSOCIATING_AUTHENTICATING ; + ieee->state =RTLLIB_ASSOCIATING_AUTHENTICATING ;RTLLIB_DEBUG_MGMT ("Sending authentication request\n" );softmac_mgmt_xmit (skb, ieee);if (!timer_pending (&ieee->associate_timer)) {
Signature · 1 line
1.8.4.1
PATCH v3 4/6 staging: rtl8192e: fix coding style errors (macros in parentheses)
In reply to Mateusz KulikowskiFix checkpatch.pl errors 'Macros with complex values should be enclosed in parentheses'.
--- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl819x_HT.h +3 -3
@@ -78,7 +78,7 @@ enum chnl_op { };#define CHHLOP_IN_PROGRESS (_pHTInfo) \ - ((_pHTInfo)->ChnlOp > CHNLOP_NONE) ? true : false + (((_pHTInfo)->ChnlOp > CHNLOP_NONE) ? true : false)/* union ht_capability {
@@ -385,8 +385,8 @@ extern u8 MCS_FILTER_1SS[16];#define LEGACY_WIRELESS_MODE IEEE_MODE_MASK#define CURRENT_RATE (WirelessMode, LegacyRate, HTRate) \ - ((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ? \ - (LegacyRate) : (PICK_RATE(LegacyRate, HTRate)) + (((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ? \ + (LegacyRate) : (PICK_RATE(LegacyRate, HTRate)))
Signature · 1 line
1.8.4.1
PATCH v3 5/6 staging: rtl8192e: rtllib_wx: fix coding style (printk -> netdev_*)
In reply to Mateusz KulikowskiUse netdev_*() functions to print diagnostic messages.
--- drivers/staging/rtl8192e/rtllib_wx.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/staging/rtl8192e/rtllib_wx.c +9 -12
@@ -389,9 +389,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,kfree (new_crypt); new_crypt =NULL ; -printk (KERN_WARNING "%s: could not initialize WEP: " -"load module rtllib_crypt_wep\n" , - dev->name); +netdev_warn (dev, +"could not initialize WEP: load module rtllib_crypt_wep\n" );return -EOPNOTSUPP ; } *crypt = new_crypt;
@@ -422,11 +421,9 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, NULL, (*crypt)->priv);if (len ==0 ) {/* Set a default key of all 0 */ -printk (KERN_INFO "Setting key %d to all zero.\n" , - key); -RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , key); +netdev_info (dev,"Setting key %d to all zero.\n" , key);memset (sec.keys[key],0 ,13 ); (*crypt)->ops->set_key (sec.keys[key],13 ,NULL , (*crypt)->priv);
@@ -468,7 +465,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,if (ieee->reset_on_keychange && ieee->iw_mode !=IW_MODE_INFRA && ieee->reset_port && ieee->reset_port (dev)) { -printk (KERN_DEBUG "%s: reset_port failed\n" , dev->name); +netdev_dbg (dev,"reset_port failed\n" );return -EINVAL ; }return 0 ;
@@ -595,7 +592,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, ret = -EINVAL ; goto done; } -printk (KERN_INFO "alg name:%s\n" , alg); +netdev_info (dev,"alg name:%s\n" , alg); ops =lib80211_get_crypto_ops (alg);if (ops ==NULL ) {
@@ -609,7 +606,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,if (ops ==NULL ) {RTLLIB_DEBUG_WX ("%s: unknown crypto alg %d\n" , dev->name, ext->alg); -printk (KERN_INFO "========>unknown crypto alg %d\n" , ext->alg); +netdev_info (dev,"unknown crypto alg %d\n" , ext->alg); ret = -EINVAL ; goto done; }
@@ -641,7 +638,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, (*crypt)->ops->set_key(ext->key, ext->key_len, ext->rx_seq, (*crypt)->priv) < 0) {RTLLIB_DEBUG_WX ("%s: key setting failed\n" , dev->name); -printk (KERN_INFO "key setting failed\n" ); +netdev_info (dev,"key setting failed\n" ); ret = -EINVAL ; goto done; }
@@ -758,9 +755,9 @@ int rtllib_wx_set_mlme(struct rtllib_device *ieee,case IW_MLME_DISASSOC :if (deauth) -printk (KERN_INFO "disauth packet !\n" ); +netdev_warn (ieee->dev,"disauth packet !\n" );else -printk (KERN_INFO "dis associate packet!\n" ); +netdev_warn (ieee->dev,"dis associate packet!\n" ); ieee->cannot_notify = true;
Signature · 1 line
1.8.4.1
PATCH v3 6/6 staging: rtl8192e: rtllib_wx: remove duplicate messages
In reply to Mateusz KulikowskiSome messages were reported with netdev_* macros and internal driver-specific macro.
--- drivers/staging/rtl8192e/rtllib_wx.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/rtl8192e/rtllib_wx.c +0 -5
@@ -421,8 +421,6 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, NULL, (*crypt)->priv);if (len ==0 ) {/* Set a default key of all 0 */ -RTLLIB_DEBUG_WX ("Setting key %d to all zero.\n" , - key);netdev_info (dev,"Setting key %d to all zero.\n" , key);memset (sec.keys[key],0 ,13 ); (*crypt)->ops->set_key(sec.keys[key], 13, NULL,
@@ -604,8 +602,6 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, ops =lib80211_get_crypto_ops (alg); }if (ops ==NULL ) { -RTLLIB_DEBUG_WX ("%s: unknown crypto alg %d\n" , - dev->name, ext->alg);netdev_info (dev,"unknown crypto alg %d\n" , ext->alg); ret = -EINVAL ; goto done;
@@ -637,7 +633,6 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,if (ext->key_len >0 && (*crypt)->ops->set_key && (*crypt)->ops->set_key (ext->key, ext->key_len, ext->rx_seq, (*crypt)->priv) <0 ) { -RTLLIB_DEBUG_WX ("%s: key setting failed\n" , dev->name);netdev_info (dev,"key setting failed\n" ); ret = -EINVAL ; goto done;
Signature · 1 line
1.8.4.1