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 -Removed extra spaces in declaration
-Placing necessary blank line after declaration
Jagath Jog J (3):
Staging: rtl8723bs: Placing opening { braces in previous line
Staging: rtl8723bs: Removed extra spaces between datatype and variable
Staging: rtl8723bs: Inserting blank line after declaration
drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 +++++----- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 + .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 98 ++++++------------- 3 files changed, 63 insertions(+), 94 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/3 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 | 98 ++++++------------- 1 file changed, 32 insertions(+), 66 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +32 -66
@@ -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
@@ -527,24 +513,19 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa param->u.crypt.err =0 ; param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN -1 ] ='\0' ; -if (param_len !=sizeof (struct ieee_param ) + param->u.crypt.key_len) - { +if (param_len !=sizeof (struct ieee_param ) + param->u.crypt.key_len) { ret = -EINVAL ; goto exit; }if (param->sta_addr[0 ] ==0xff && param->sta_addr[1 ] ==0xff && param->sta_addr[2 ] ==0xff && param->sta_addr[3 ] ==0xff && - param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) - { -if (param->u.crypt.idx >=WEP_KEYS ) - { + param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) { +if (param->u.crypt.idx >=WEP_KEYS ) { ret = -EINVAL ; goto exit; } - } -else - { + }else { psta =rtw_get_stainfo (pstapriv, param->sta_addr);if (!psta)/* ret = -EINVAL; */
@@ -554,24 +535,20 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_paif (strcmp (param->u.crypt.alg,"none" ) ==0 && !psta) goto exit; -if (strcmp (param->u.crypt.alg,"WEP" ) ==0 && !psta) - { +if (strcmp (param->u.crypt.alg,"WEP" ) ==0 && !psta) { wep_key_idx = param->u.crypt.idx; wep_key_len = param->u.crypt.key_len; -if ((wep_key_idx >=WEP_KEYS ) || (wep_key_len <=0 )) - { +if ((wep_key_idx >=WEP_KEYS ) || (wep_key_len <=0 )) { ret = -EINVAL ; goto exit; } -if (wep_key_len >0 ) - { +if (wep_key_len >0 ) { wep_key_len = wep_key_len <=5 ?5 :13 ; } -if (psecuritypriv->bWepDefaultKeyIdxSet ==0 ) - { +if (psecuritypriv->bWepDefaultKeyIdxSet ==0 ) {/* wep default key has not been set, so use this key index as default key. */ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Auto;
@@ -579,8 +556,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; psecuritypriv->dot118021XGrpPrivacy = _WEP40_; -if (wep_key_len ==13 ) - { +if (wep_key_len ==13 ) { psecuritypriv->dot11PrivacyAlgrthm = _WEP104_; psecuritypriv->dot118021XGrpPrivacy = _WEP104_; }
@@ -598,24 +574,19 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa } - -if (!psta &&check_fwstate (pmlmepriv,WIFI_AP_STATE ))/* group key */ - { -if (param->u.crypt.set_tx ==0 )/* group key */ - { -if (strcmp (param->u.crypt.alg,"WEP" ) ==0 ) - { +/* group key */ +if (!psta &&check_fwstate (pmlmepriv,WIFI_AP_STATE )) { +/* group key */ +if (param->u.crypt.set_tx ==0 ) { +if (strcmp (param->u.crypt.alg,"WEP" ) ==0 ) {memcpy (grpkey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len)); psecuritypriv->dot118021XGrpPrivacy = _WEP40_; -if (param->u.crypt.key_len ==13 ) - { +if (param->u.crypt.key_len ==13 ) { psecuritypriv->dot118021XGrpPrivacy = _WEP104_; } - } -else if (strcmp (param->u.crypt.alg,"TKIP" ) ==0 ) - { + }else if (strcmp (param->u.crypt.alg,"TKIP" ) ==0 ) { psecuritypriv->dot118021XGrpPrivacy = _TKIP_;memcpy (grpkey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));
@@ -627,15 +598,11 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->busetkipkey = true; - } -else if (strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) - { + }else if (strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) { psecuritypriv->dot118021XGrpPrivacy = _AES_;memcpy (grpkey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len)); - } -else - { + }else { psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; }
@@ -648,8 +615,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_partw_ap_set_group_key (padapter, param->u.crypt.key, psecuritypriv->dot118021XGrpPrivacy, param->u.crypt.idx); pbcmc_sta =rtw_get_bcmc_stainfo (padapter); -if (pbcmc_sta) - { +if (pbcmc_sta) { pbcmc_sta->ieee8021x_blocked = false; pbcmc_sta->dot118021XPrivacy = psecuritypriv->dot118021XGrpPrivacy;/* rx will use bmc_sta's dot118021XPrivacy */ }
Signature · 1 line
2.17.1
Re: [Patch 1/3] Staging: rtl8723bs: Placing opening { braces in previous line
Quoted 3 lines · Jagath Jog J
Fix following checkpatch.pl error by placing opening { braces in previous line
ERROR: that open brace { should be on the previous line
[]
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
Quoted 1 line
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0
-0
[]
Quoted 5 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0
-1@@ -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 )
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static struct ieee80211_supported_band *rtw_spt_band_alloc( · line 121
Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2
-4- { +if (band ==NL80211_BAND_2GHZ ) { n_channels =RTW_2G_CHANNELS_NUM ; n_bitrates =RTW_G_RATES_NUM ; - } - else - { + }else { goto exit; }
Reversing the test would be less indented and simpler code:
if (band != NL80211_BAND_2GHZ) goto exit; n_channels = RTW_2G_CHANNELS_NUM; n_bitrates = RTW_G_RATES_NUM;
etc...
PATCH 2/3 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 | 54 ++++++++++++------------ 1 file changed, 26 insertions(+), 28 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +26 -28
@@ -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;
@@ -789,9 +789,9 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) phtpriv->ht_option = false; ptmp =rtw_get_ie (&pnetwork->network.ies[12 ],WLAN_EID_HT_CAPABILITY , &tmp_len, pnetwork->network.ie_length-12 );if (pregistrypriv->ht_enable && ptmp && tmp_len >0 ) { -/* Added by Albert 2010/06/23 */ -/* For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. */ -/* Especially for Realtek 8192u SoftAP. */ +/* Added by Albert 2010/06/23 */ +/* For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. */ +/* Especially for Realtek 8192u SoftAP. */ if ((padapter->securitypriv.dot11PrivacyAlgrthm != _WEP40_) && (padapter->securitypriv.dot11PrivacyAlgrthm != _WEP104_) && (padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_)) {
@@ -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;
@@ -1009,9 +1008,9 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueuu8 rtw_addbareq_cmd (struct adapter *padapter,u8 tid,u8 *addr) { -struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct cmd_obj *ph2c; -struct addBaReq_parm *paddbareq_parm; +struct addBaReq_parm *paddbareq_parm;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);
@@ -1409,7 +1407,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)u8 rtw_lps_ctrl_wk_cmd (struct adapter *padapter,u8 lps_ctrl_type,u8 enqueue) {struct cmd_obj *ph2c; -struct drvextra_cmd_parm *pdrvextra_cmd_parm; +struct drvextra_cmd_parm *pdrvextra_cmd_parm;struct cmd_priv *pcmdpriv = &padapter->cmdpriv;/* struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); */ u8 res = _SUCCESS;
Signature · 1 line
2.17.1
PATCH 3/3 Staging: rtl8723bs: Inserting blank line after declaration
In reply to Jagath Jog JFix following checkpatch.pl warning by inserting blank line
WARNING: Missing a blank line after declarations
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/staging/rtl8723bs/hal/hal_intf.c +5 -0
@@ -181,6 +181,7 @@ 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);
@@ -209,6 +210,7 @@ s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)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; */
@@ -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
Hi,
Review
Quoted 5 lines · Jagath Jog J
This series fix the following errors/warnings:
(quoted diff) +0
-3-Placing { braces at the end of same line of if condition -Removed extra spaces in declaration -Placing necessary blank line after declaration
Thanks, series looks good to me:
for the series.
Regards,
Hans
Quoted 11 lines
Jagath Jog J (3):
Staging: rtl8723bs: Placing opening { braces in previous line
Staging: rtl8723bs: Removed extra spaces between datatype and variable
Staging: rtl8723bs: Inserting blank line after declarationdrivers/staging/rtl8723bs/core/rtw_cmd.c | 54 +++++----- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 + .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 98 ++++++------------- 3 files changed, 63 insertions(+), 94 deletions(-)