Staging: rtl8723bs: Fix codestyle errors and warnings
cover Staging: rtl8723bs: Fix codestyle errors and warnings
This series fix the following errors/warnings:
-Placing { braces at the end of same line of if condition -Placing constants on the right side of test -Removed extra spaces in declaration
-Placing necessary blank line after declaration
Jagath Jog J (4):
Staging: rtl8723bs: Placing opening { braces in previous line
Staging: rtl8723bs: Interchanging comparison expression operands
Staging: rtl8723bs: Removed extra spaces between datatype and variable
Staging: rtl8723bs: Inserting blank line after declaration
drivers/staging/rtl8723bs/core/rtw_cmd.c | 42 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 15 ++++--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 40 ++++++------------ 4 files changed, 44 insertions(+), 55 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/4 Staging: rtl8723bs: Placing opening { braces in previous line
Fix following checkpatch.pl error by placing opening { braces in previous line
ERROR: that open brace { should be on the previous line
--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +13 -27
@@ -113,13 +113,10 @@ static struct ieee80211_supported_band *rtw_spt_band_alloc(struct ieee80211_supported_band *spt_band =NULL ;int n_channels, n_bitrates; -if (band ==NL80211_BAND_2GHZ ) - { +if (band ==NL80211_BAND_2GHZ ) { n_channels =RTW_2G_CHANNELS_NUM ; n_bitrates =RTW_G_RATES_NUM ; - } -else - { + }else { goto exit; }
@@ -135,8 +132,7 @@ static struct ieee80211_supported_band *rtw_spt_band_alloc( spt_band->n_channels = n_channels; spt_band->n_bitrates = n_bitrates; -if (band ==NL80211_BAND_2GHZ ) - { +if (band ==NL80211_BAND_2GHZ ) {rtw_2g_channels_init (spt_band->channels);rtw_2g_rates_init (spt_band->bitrates); }
@@ -235,8 +231,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl {u16 wapi_len =0 ; -if (rtw_get_wapi_ie (pnetwork->network.ies, pnetwork->network.ie_length,NULL , &wapi_len) >0 ) - { +if (rtw_get_wapi_ie (pnetwork->network.ies, pnetwork->network.ie_length,NULL , &wapi_len) >0 ) {if (wapi_len >0 ) goto exit; }
@@ -244,8 +239,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl/* To reduce PBC Overlap rate */ /* spin_lock_bh(&pwdev_priv->scan_req_lock); */ -if (adapter_wdev_data (padapter)->scan_request) - { +if (adapter_wdev_data (padapter)->scan_request) {u8 *psr =NULL , sr =0 ;struct ndis_802_11_ssid *pssid = &pnetwork->network.ssid;struct cfg80211_scan_request *request =adapter_wdev_data (padapter)->scan_request;
@@ -258,14 +252,12 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlif (wpsie && wpsielen >0 ) psr =rtw_get_wps_attr_content (wpsie, wpsielen,WPS_ATTR_SELECTED_REGISTRAR , (u8 *)(&sr),NULL ); -if (sr !=0 ) - { -if (request->n_ssids ==1 && request->n_channels ==1 )/* it means under processing WPS */ - { +if (sr !=0 ) { +/* it means under processing WPS */ +if (request->n_ssids ==1 && request->n_channels ==1 ) {if (ssids[0 ].ssid_len !=0 && (pssid->ssid_length != ssids[0 ].ssid_len || -memcmp (pssid->ssid, ssids[0 ].ssid, ssids[0 ].ssid_len))) - { +memcmp (pssid->ssid, ssids[0 ].ssid, ssids[0 ].ssid_len))) {if (psr) *psr =0 ;/* clear sr */ }
@@ -374,8 +366,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)int freq = (int )cur_network->network.configuration.ds_config;struct ieee80211_channel *chan; -if (pwdev->iftype !=NL80211_IFTYPE_ADHOC ) - { +if (pwdev->iftype !=NL80211_IFTYPE_ADHOC ) {return ; }
@@ -383,14 +374,11 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);struct wlan_network *scanned = pmlmepriv->cur_network_scanned; -if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) - { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) {memcpy (&cur_network->network, pnetwork,sizeof (struct wlan_bssid_ex ));rtw_cfg80211_inform_bss (padapter, cur_network); - } -else - { + }else {if (!scanned) {rtw_warn_on (1 );return ;
@@ -473,9 +461,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter) roam_info.resp_ie_len = pmlmepriv->assoc_rsp_len-sizeof (struct ieee80211_hdr_3addr )-6 ;cfg80211_roamed (padapter->pnetdev, &roam_info,GFP_ATOMIC ); - } -else - { + }else {cfg80211_connect_result (padapter->pnetdev, cur_network->network.mac_address , pmlmepriv->assoc_req+sizeof (struct ieee80211_hdr_3addr )+2 , pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2
Signature · 1 line
2.17.1
PATCH 2/4 Staging: rtl8723bs: Interchanging comparison expression operands
In reply to Jagath Jog JFix following checkpatch.pl warning by placing constant on rignt side of comparison
WARNING: Comparisons should place the constant on the right side of the test
--- drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_security.c +1 -1
@@ -1554,7 +1554,7 @@ void rtw_sec_restore_wep_key(struct adapter *adapter)struct security_priv *securitypriv = &(adapter->securitypriv);signed int keyid; -if ((_WEP40_ == securitypriv->dot11PrivacyAlgrthm) || (_WEP104_ == securitypriv->dot11PrivacyAlgrthm)) { +if ((securitypriv->dot11PrivacyAlgrthm == _WEP40_) || (securitypriv->dot11PrivacyAlgrthm == _WEP104_)) {for (keyid =0 ; keyid <4 ; keyid++) {if (securitypriv->key_mask &BIT (keyid)) {if (keyid == securitypriv->dot11PrivacyKeyIndex)
Signature · 1 line
2.17.1
PATCH 3/4 Staging: rtl8723bs: Removed extra spaces between datatype and variable
In reply to Jagath Jog JFix following checkpatch.pl warning by placing single space between datatype and variable
WARNING: please, no space before tabs
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 42 +++++++++++------------- 1 file changed, 20 insertions(+), 22 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +20 -22
@@ -531,9 +531,9 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, struct rtw_ieee80211_channel *ch, int ch_num) {u8 res = _FAIL; -struct cmd_obj *ph2c; -struct sitesurvey_parm *psurveyPara; -struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +struct cmd_obj *ph2c; +struct sitesurvey_parm *psurveyPara; +struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;if (check_fwstate (pmlmepriv, _FW_LINKED))
@@ -632,8 +632,8 @@ void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pu8 rtw_createbss_cmd (struct adapter *padapter) {struct cmd_obj *pcmd; -struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network; +struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network;u8 res = _SUCCESS; pcmd =rtw_zmalloc (sizeof (struct cmd_obj ));
@@ -707,14 +707,14 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) {u8 res = _SUCCESS;uint t_len =0 ; -struct wlan_bssid_ex *psecnetwork; -struct cmd_obj *pcmd; -struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct qos_priv *pqospriv = &pmlmepriv->qospriv; +struct wlan_bssid_ex *psecnetwork; +struct cmd_obj *pcmd; +struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct qos_priv *pqospriv = &pmlmepriv->qospriv;struct security_priv *psecuritypriv = &padapter->securitypriv;struct registry_priv *pregistrypriv = &padapter->registrypriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;enum ndis_802_11_network_infrastructure ndis_network_mode = pnetwork->network.infrastructure_mode;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -897,12 +897,11 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infrastu8 rtw_setstakey_cmd (struct adapter *padapter,struct sta_info *sta,u8 unicast_key,bool enqueue) {struct cmd_obj *ph2c; -struct set_stakey_parm *psetstakey_para; -struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -struct set_stakey_rsp *psetstakey_rsp =NULL ; - -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct security_priv *psecuritypriv = &padapter->securitypriv; +struct set_stakey_parm *psetstakey_para; +struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +struct set_stakey_rsp *psetstakey_rsp =NULL ; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct security_priv *psecuritypriv = &padapter->securitypriv;u8 res = _SUCCESS; psetstakey_para =rtw_zmalloc (sizeof (struct set_stakey_parm ));
@@ -957,9 +956,9 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_u8 rtw_clearstakey_cmd (struct adapter *padapter,struct sta_info *sta,u8 enqueue) {struct cmd_obj *ph2c; -struct set_stakey_parm *psetstakey_para; -struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -struct set_stakey_rsp *psetstakey_rsp =NULL ; +struct set_stakey_parm *psetstakey_para; +struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +struct set_stakey_rsp *psetstakey_rsp =NULL ;s16 cam_id =0 ;u8 res = _SUCCESS;
@@ -1228,8 +1227,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)u16 BusyThreshold = BusyThresholdHigh;u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false; - -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;collect_traffic_statistics (padapter);
Signature · 1 line
2.17.1
PATCH 4/4 Staging: rtl8723bs: Inserting blank line after declaration
In reply to Jagath Jog JFix following checkpatch.pl warning by inserting blank line and removing unwanted spaces
WARNING: Missing a blank line after declarations
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +10 -5
@@ -181,13 +181,14 @@ void rtw_hal_disable_interrupt(struct adapter *padapter)u8 rtw_hal_check_ips_status (struct adapter *padapter) {u8 val = false; +if (padapter->HalFunc.check_ips_status) val = padapter->HalFunc.check_ips_status (padapter);return val; } -s32 rtw_hal_xmitframe_enqueue (struct adapter *padapter,struct xmit_frame *pxmitframe) +s32 rtw_hal_xmitframe_enqueue (struct adapter *padapter,struct xmit_frame *pxmitframe) {if (padapter->HalFunc.hal_xmitframe_enqueue)return padapter->HalFunc.hal_xmitframe_enqueue (padapter, pxmitframe);
@@ -195,7 +196,7 @@ s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitreturn false; } -s32 rtw_hal_xmit (struct adapter *padapter,struct xmit_frame *pxmitframe) +s32 rtw_hal_xmit (struct adapter *padapter,struct xmit_frame *pxmitframe) {if (padapter->HalFunc.hal_xmit)return padapter->HalFunc.hal_xmit (padapter, pxmitframe);
@@ -206,9 +207,10 @@ s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)/* * [IMPORTANT] This function would be run in interrupt context. */ -s32 rtw_hal_mgnt_xmit (struct adapter *padapter,struct xmit_frame *pmgntframe) +s32 rtw_hal_mgnt_xmit (struct adapter *padapter,struct xmit_frame *pmgntframe) {s32 ret = _FAIL; +update_mgntframe_attrib_addr (padapter, pmgntframe);/* pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; */ /* pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; */
@@ -230,7 +232,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe)return ret; } -s32 rtw_hal_init_xmit_priv (struct adapter *padapter) +s32 rtw_hal_init_xmit_priv (struct adapter *padapter) {if (padapter->HalFunc.init_xmit_priv)return padapter->HalFunc.init_xmit_priv (padapter);
@@ -243,7 +245,7 @@ void rtw_hal_free_xmit_priv(struct adapter *padapter) padapter->HalFunc.free_xmit_priv (padapter); } -s32 rtw_hal_init_recv_priv (struct adapter *padapter) +s32 rtw_hal_init_recv_priv (struct adapter *padapter) {if (padapter->HalFunc.init_recv_priv)return padapter->HalFunc.init_recv_priv (padapter);
@@ -299,6 +301,7 @@ void rtw_hal_stop_thread(struct adapter *padapter)u32 rtw_hal_read_bbreg (struct adapter *padapter,u32 RegAddr,u32 BitMask) {u32 data =0 ; +if (padapter->HalFunc.read_bbreg) data = padapter->HalFunc.read_bbreg (padapter, RegAddr, BitMask);return data;
@@ -312,6 +315,7 @@ void rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32u32 rtw_hal_read_rfreg (struct adapter *padapter,u32 eRFPath,u32 RegAddr,u32 BitMask) {u32 data =0 ; +if (padapter->HalFunc.read_rfreg) data = padapter->HalFunc.read_rfreg (padapter, eRFPath, RegAddr, BitMask);return data;
@@ -385,6 +389,7 @@ bool rtw_hal_c2h_valid(struct adapter *adapter, u8 *buf)s32 rtw_hal_c2h_handler (struct adapter *adapter,u8 *c2h_evt) {s32 ret = _FAIL; +if (adapter->HalFunc.c2h_handler) ret = adapter->HalFunc.c2h_handler (adapter, c2h_evt);return ret;
Signature · 1 line
2.17.1