staging: rtl8723bs: Fix coding style issues in header files
v2 cover staging: rtl8723bs: Fix coding style issues in header files
This patch series fixes coding style issues in the rtl8723bs staging driver header files, as reported by checkpatch.pl.
v2: Combined the four comment style patches into a single patch
per Dan Carpenter's feedback. Kept the enum indentation fix separate as requested.
Subhrojyoti Bala (2):
staging: rtl8723bs: Fix indentation in enum in rtw_mlme.h
staging: rtl8723bs: Fix comment style issues in header files
drivers/staging/rtl8723bs/include/rtw_mlme.h | 56 +++++++++---------- .../staging/rtl8723bs/include/wlan_bssdef.h | 13 +++-- 2 files changed, 35 insertions(+), 34 deletions(-)
Signature · 1 line
2.54.0
PATCH v2 1/2 staging: rtl8723bs: Fix indentation in enum in rtw_mlme.h
Enum members were missing tab indentation. Add proper tab indent to align with kernel coding style.
No functional change.
---
v2: No changes to this patch.
drivers/staging/rtl8723bs/include/rtw_mlme.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +6 -6
@@ -44,12 +44,12 @@enum { - dot11AuthAlgrthm_Open =0 , - dot11AuthAlgrthm_Shared, - dot11AuthAlgrthm_8021X, - dot11AuthAlgrthm_Auto, - dot11AuthAlgrthm_WAPI, - dot11AuthAlgrthm_MaxNum + dot11AuthAlgrthm_Open =0 , + dot11AuthAlgrthm_Shared, + dot11AuthAlgrthm_8021X, + dot11AuthAlgrthm_Auto, + dot11AuthAlgrthm_WAPI, + dot11AuthAlgrthm_MaxNum };/* Scan type including active and passive scan. */
Signature · 1 line
2.54.0
PATCH v2 2/2 staging: rtl8723bs: Fix comment style issues in header files
In reply to Subhrojyoti BalaFix various comment style issues in wlan_bssdef.h and rtw_mlme.h to comply with kernel coding style:
- Use proper multi-line comment format with trailing */ on its own line
- Remove extra spaces after /* in single-line comments
No functional change.
---
v2: Combined four separate comment style patches from v1 into
this single patch per Dan Carpenter's feedback.
drivers/staging/rtl8723bs/include/rtw_mlme.h | 44 +++++++++---------- .../staging/rtl8723bs/include/wlan_bssdef.h | 13 +++--- 2 files changed, 29 insertions(+), 28 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +22 -22
@@ -13,8 +13,8 @@/* define MAX_JOIN_TIMEOUT 2500 */ #define MAX_JOIN_TIMEOUT 6500 -/* Commented by Albert 20101105 */ -/* Increase the scanning timeout because of increasing the SURVEY_TO value. */ +/* Commented by Albert 20101105 */ +/* Increase the scanning timeout because of increasing the SURVEY_TO value. */ #define SCANNING_TIMEOUT 8000
@@ -52,7 +52,7 @@ enum {dot11AuthAlgrthm_MaxNum }; -/* Scan type including active and passive scan. */ +/* Scan type including active and passive scan. */ enum rt_scan_type {SCAN_PASSIVE ,SCAN_ACTIVE ,
@@ -67,23 +67,22 @@ enum { };/* - -there are several "locks" in mlme_priv, -since mlme_priv is a shared resource between many threads, -like ISR/Call-Back functions, the OID handlers, and even timer functions. - -Each struct __queue has its own locks, already. -Other items in mlme_priv are protected by mlme_priv.lock, while items in -xmit_priv are protected by xmit_priv.lock. - -To avoid possible dead lock, any thread trying to modifying mlme_priv -SHALL not lock up more than one locks at a time! - -The only exception is that queue functions which take the __queue.lock -may be called with the xmit_priv.lock held. In this case the order -MUST always be first lock xmit_priv.lock and then call any queue functions -which take __queue.lock. -*/ +* There are several "locks" in mlme_priv, +* since mlme_priv is a shared resource between many threads, +* like ISR/Call-Back functions, the OID handlers, and even timer functions. +* +* Each struct __queue has its own locks, already. +* Other items in mlme_priv are protected by mlme_priv.lock, while items in +* xmit_priv are protected by xmit_priv.lock. +* +* To avoid possible dead lock, any thread trying to modifying mlme_priv +* SHALL not lock up more than one locks at a time! +* +* The only exception is that queue functions which take the __queue.lock +* may be called with the xmit_priv.lock held. In this case the order +* MUST always be first lock xmit_priv.lock and then call any queue functions +* which take __queue.lock. +*/ struct sitesurvey_ctrl {u64 last_tx_pkts;
@@ -184,7 +183,8 @@ struct mlme_priv {u32 wps_probe_req_ie_len;/* Number of associated Non-ERP stations (i.e., stations using 802.11b -* in 802.11g BSS) */ +* in 802.11g BSS) +*/ int num_sta_non_erp;/* Number of associated stations that do not support Short Slot Time */
@@ -279,7 +279,7 @@ extern signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psstatic inline u8 *get_bssid (struct mlme_priv *pmlmepriv) {/* if sta_mode:pmlmepriv->cur_network.network.mac_address => bssid */ -/* if adhoc_mode:pmlmepriv->cur_network.network.mac_address => ibss mac address */ +/* if adhoc_mode:pmlmepriv->cur_network.network.mac_address => ibss mac address */ return pmlmepriv->cur_network.network.mac_address; }
drivers/staging/rtl8723bs/include/wlan_bssdef.h +7 -6
@@ -32,9 +32,9 @@ enum ndis_802_11_network_type { };/* -FW will only save the channel number in DSConfig. -ODI Handler will convert the channel number to freq. number. -*/ +* FW will only save the channel number in DSConfig. +* ODI Handler will convert the channel number to freq. number. +*/ struct ndis_802_11_conf {u32 length;/* Length of structure */ u32 beacon_period;/* units are Kusec */
@@ -138,7 +138,8 @@ struct wlan_phy_info {struct wlan_bcn_info {/* these infor get from rtw_get_encrypt_info when -* * translate scan to UI */ +* translate scan to UI +*/ u8 encryp_protocol;/* ENCRYP_PROTOCOL_E: OPEN/WEP/WPA/WPA2/WAPI */ int group_cipher;/* WPA/WPA2 group cipher */ int pairwise_cipher;/* WPA/WPA2/WEP pairwise cipher */
@@ -150,8 +151,8 @@ struct wlan_bcn_info { };/* temporally add #pragma pack for structure alignment issue of -* struct wlan_bssid_ex and get_wlan_bssid_ex_sz() -*/ +* struct wlan_bssid_ex and get_wlan_bssid_ex_sz() +*/ struct wlan_bssid_ex {u32 length;u8 mac_address[ETH_ALEN ];
Signature · 1 line
2.54.0
Re: [PATCH v2 2/2] staging: rtl8723bs: Fix comment style issues in header files
Quoted 7 lines · Subhrojyoti Bala
Fix various comment style issues in
wlan_bssdef.handrtw_mlme.hto comply with kernel coding style:- Use proper multi-line comment format with trailing */ on its own line
- Remove extra spaces after /* in single-line comments
Quoted 6 lines
No functional change.
Signed-off-by Subhrojyoti Bala <[email protected]>---
v2: Combined four separate comment style patches from v1 into
this single patch per Dan Carpenter's feedback.
LGTM.
regards,
dan carpenter