staging: rtl8723bs: fix remaining coding style issues
v3 cover staging: rtl8723bs: fix remaining coding style issues
This series fixes the remaining coding style issues in rtw_cmd.c. Patch 2/3 from the original series (blank lines) has already been applied.
Changes in v3:
- Fixed malformed subject lines (split title and description) in both patches as requested by Greg KH.
Changes in v2:
- Fixed double spaces around '+' operator.
- Rebased alignment fixes on top of spacing fixes.
Archit Anant (2):
staging: rtl8723bs: fix spacing around operators
staging: rtl8723bs: fix alignment to match open parenthesis
drivers/staging/rtl8723bs/core/rtw_cmd.c | 46 ++++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-)
Signature · 1 line
2.39.5
PATCH v3 1/2 staging: rtl8723bs: fix spacing around operators
Add missing spaces around mathematical and logical operators (+, -, /, |, ?, :) and remove multiple spaces around operators to comply with the Linux kernel coding style.
Issue identified by checkpatch.pl and review feedback.
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +13 -13
@@ -185,7 +185,7 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)return -ENOMEM ; } - pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf +4 - ((SIZE_PTR )(pcmdpriv->rsp_allocated_buf) &3 ); + pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf +4 - ((SIZE_PTR )(pcmdpriv->rsp_allocated_buf) &3 ); pcmdpriv->cmd_issued_cnt =0 ; pcmdpriv->cmd_done_cnt =0 ;
@@ -697,7 +697,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) t_len =sizeof (struct wlan_bssid_ex );/* for hidden ap to set fw_state here */ -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE |WIFI_ADHOC_STATE ) != true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE |WIFI_ADHOC_STATE ) != true) {switch (ndis_network_mode) {case Ndis802_11IBSS:set_fwstate (pmlmepriv,WIFI_ADHOC_STATE );
@@ -722,10 +722,10 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) psecuritypriv->authenticator_ie[0 ] = (unsigned char )psecnetwork->ie_length; -if ((psecnetwork->ie_length-12 ) < (256 -1 )) -memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], psecnetwork->ie_length-12 ); +if ((psecnetwork->ie_length -12 ) < (256 -1 )) +memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], psecnetwork->ie_length -12 );else -memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], (256 -1 )); +memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], (256 -1 )); psecnetwork->ie_length =0 ;/* Added by Albert 2009/02/18 */
@@ -752,7 +752,7 @@ 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 ); + 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. */
@@ -766,7 +766,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)/* rtw_restructure_ht_ie */ rtw_restructure_ht_ie (padapter, &pnetwork->network.ies[12 ], &psecnetwork->ies[0 ], - pnetwork->network.ie_length-12 , &psecnetwork->ie_length, + pnetwork->network.ie_length -12 , &psecnetwork->ie_length, pnetwork->network.configuration.ds_config); } }
@@ -1124,8 +1124,8 @@ static void collect_traffic_statistics(struct adapter *padapter) pdvobjpriv->traffic_stat.last_tx_bytes = pdvobjpriv->traffic_stat.tx_bytes; pdvobjpriv->traffic_stat.last_rx_bytes = pdvobjpriv->traffic_stat.rx_bytes; - pdvobjpriv->traffic_stat.cur_tx_tp = (u32)(pdvobjpriv->traffic_stat.cur_tx_bytes *8 /2 /1024 /1024 ); - pdvobjpriv->traffic_stat.cur_rx_tp = (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes *8 /2 /1024 /1024 ); + pdvobjpriv->traffic_stat.cur_tx_tp = (u32)(pdvobjpriv->traffic_stat.cur_tx_bytes *8 /2 /1024 /1024 ); + pdvobjpriv->traffic_stat.cur_rx_tp = (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes *8 /2 /1024 /1024 ); }u8 traffic_status_watchdog (struct adapter *padapter,u8 from_timer)
@@ -1596,9 +1596,9 @@ static void rtw_btinfo_hdl(struct adapter *adapter, u8 *buf, u16 buf_len) cmd_idx = info->cid; -if (info->len > buf_len-2 ) { +if (info->len > buf_len -2 ) {rtw_warn_on (1 ); - len = buf_len-2 ; + len = buf_len -2 ; }else { len = info->len; }
@@ -1608,7 +1608,7 @@ static void rtw_btinfo_hdl(struct adapter *adapter, u8 *buf, u16 buf_len) buf[1 ] =0 ; else if (cmd_idx == BTINFO_BT_AUTO_RPT) buf[1 ] =2 ; -hal_btcoex_BtInfoNotify (adapter, len+1 , &buf[1 ]); +hal_btcoex_BtInfoNotify (adapter, len +1 , &buf[1 ]); }u8 rtw_c2h_packet_wk_cmd (struct adapter *padapter,u8 *pbuf,u16 length)
@@ -1668,7 +1668,7 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt) pdrvextra_cmd_parm->ec_id =C2H_WK_CID ; pdrvextra_cmd_parm->type =0 ; - pdrvextra_cmd_parm->size = c2h_evt?16 :0 ; + pdrvextra_cmd_parm->size = c2h_evt ?16 :0 ; pdrvextra_cmd_parm->pbuf = c2h_evt;init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm,GEN_CMD_CODE (_Set_Drv_Extra));
Signature · 1 line
2.39.5
PATCH v3 2/2 staging: rtl8723bs: fix alignment to match open parenthesis
In reply to Archit AnantAlign arguments and conditions with the open parenthesis of the preceding line to comply with the Linux kernel coding style.
Issue identified by checkpatch.pl.
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +11 -11
@@ -306,7 +306,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) bAllow = true;if ((!pcmdpriv->padapter->hw_init_completed && !bAllow) || - !atomic_read (&pcmdpriv->cmdthd_running))/* com_thread not running */ + !atomic_read (&pcmdpriv->cmdthd_running))/* com_thread not running */ return _FAIL;return _SUCCESS;
@@ -364,7 +364,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd)void rtw_stop_cmd_thread (struct adapter *adapter) {if (adapter->cmdThread && -atomic_read (&adapter->cmdpriv.cmdthd_running) && +atomic_read (&adapter->cmdpriv.cmdthd_running) && adapter->cmdpriv.stop_req ==0 ) { adapter->cmdpriv.stop_req =1 ;complete (&adapter->cmdpriv.cmd_queue_comp);
@@ -524,7 +524,7 @@ int rtw_cmd_thread(void *context)*/ u8 rtw_sitesurvey_cmd (struct adapter *padapter,struct ndis_802_11_ssid *ssid,int ssid_num, -struct rtw_ieee80211_channel *ch,int ch_num) +struct rtw_ieee80211_channel *ch,int ch_num) {u8 res = _FAIL;struct cmd_obj *ph2c;
@@ -758,16 +758,16 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)/* 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_)) { + (padapter->securitypriv.dot11PrivacyAlgrthm != _WEP104_) && + (padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_)) {rtw_ht_use_default_setting (padapter);rtw_build_wmm_ie_ht (padapter, &psecnetwork->ies[12 ], &psecnetwork->ie_length);/* rtw_restructure_ht_ie */ rtw_restructure_ht_ie (padapter, &pnetwork->network.ies[12 ], &psecnetwork->ies[0 ], - pnetwork->network.ie_length -12 , &psecnetwork->ie_length, - pnetwork->network.configuration.ds_config); + pnetwork->network.ie_length -12 , &psecnetwork->ie_length, + pnetwork->network.configuration.ds_config); } }
@@ -1150,7 +1150,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) BusyThreshold = BusyThresholdLow;if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { bBusyTraffic = true;if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)
@@ -1161,7 +1161,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)/* Higher Tx/Rx data. */ if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod >4000 || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod >4000 ) { + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod >4000 ) { bHigherBusyTraffic = true;if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)
@@ -1172,7 +1172,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)/* check traffic for powersaving. */ if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) >8 ) || - (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >2 )) { + (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >2 )) { bEnterPS = false;if (bBusyTraffic) {
@@ -1265,7 +1265,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)u8 mstatus;if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || -check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { +check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {return ; }
Signature · 1 line
2.39.5