staging: rtl8723bs: core: Cleanup patchset for style issues in rtw_cmd.c
v4 cover staging: rtl8723bs: core: Cleanup patchset for style issues in rtw_cmd.c
These patches make changes to clean up style issues identified by checkpatch.
Kushal Kothari (4):
staging: rtl8723bs: core: Remove true and false comparison
staging: rtl8723bs: core: Remove unnecessary parentheses
staging: rtl8723bs: core: Remove unnecessary space after a cast
staging: rtl8723bs: core: Remove unnecessary blank lines
drivers/staging/rtl8723bs/core/rtw_cmd.c | 94 +++++++++--------------- 1 file changed, 34 insertions(+), 60 deletions(-)
Signature · 13 lines
2.25.1 Changes in v4: move version notes below the cutoff Changes in v3: Enclose the version number inside the square bracket in the subject. Changes in v2: [PATCH 1/4]: Moved unnecessary parentheses change in PATCH 2/4 [PATCH 2/4]: Added the extra parentheses change from PATCH 1/4 here. [PATCH 3/4]: No Changes [PATCH 4/4]: Fix whitespace error.
PATCH v4 1/4 staging: rtl8723bs: core: Remove true and false comparison
Remove comparison to true and false in if statement. Issue found with checkpatch.pl.
CHECK: Using comparison to true is error prone
CHECK: Using comparison to false is error prone
---
Changes in v4: move these version notes
Changes in v3: Enclose the version number inside the square bracket.
Changes in v2: Unnecessary parantheses handled in *v2 staging: rtl8723bs: core: Remove unnecessary parentheses*
drivers/staging/rtl8723bs/core/rtw_cmd.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +11 -11
@@ -371,7 +371,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)) == true && +atomic_read (&(adapter->cmdpriv.cmdthd_running)) && adapter->cmdpriv.stop_req ==0 ) { adapter->cmdpriv.stop_req =1 ;complete (&adapter->cmdpriv.cmd_queue_comp);
@@ -542,7 +542,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_SCAN ,1 ); ph2c =rtw_zmalloc (sizeof (struct cmd_obj ));
@@ -775,7 +775,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)/* If not, we have to copy the connecting AP's MAC address to it so that */ /* the driver just has the bssid information for PMKIDList searching. */ -if (pmlmepriv->assoc_by_bssid == false) +if (!pmlmepriv->assoc_by_bssid)memcpy (&pmlmepriv->assoc_bssid[0 ], &pnetwork->network.mac_address[0 ],ETH_ALEN ); psecnetwork->ie_length =rtw_restruct_sec_ie (padapter, &pnetwork->network.ies[0 ], &psecnetwork->ies[0 ], pnetwork->network.ie_length);
@@ -1164,7 +1164,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconfu8 res = _SUCCESS;/* check if allow software config */ -if (swconfig &&rtw_hal_is_disable_sw_channel_plan (padapter) == true) { +if (swconfig &&rtw_hal_is_disable_sw_channel_plan (padapter)) { res = _FAIL; goto exit; }
@@ -1250,7 +1250,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)/* */ /* Determine if our traffic is busy now */ /* */ -if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) +if ((check_fwstate (pmlmepriv, _FW_LINKED))/*&& !MgntInitAdapterInProgress(pMgntInfo)*/ ) {/* if we raise bBusyTraffic in last watchdog, using lower threshold. */ if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
@@ -1342,7 +1342,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter) pmlmepriv = &(padapter->mlmepriv); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_AP_STATE ))expire_timeout_chk (padapter);/* for debug purpose */
@@ -1377,8 +1377,8 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);u8 mstatus; -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) - || (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) { +if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) || + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ))) {return ; }
@@ -1386,7 +1386,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)case LPS_CTRL_SCAN :hal_btcoex_ScanNotify (padapter, true); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED)) {/* connect */ LPS_Leave (padapter,"LPS_CTRL_SCAN" ); }
@@ -1512,7 +1512,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)if (dtim <=0 || dtim >16 )return ; -if (hal_btcoex_IsBtControlLps (padapter) == true) +if (hal_btcoex_IsBtControlLps (padapter))return ;mutex_lock (&pwrpriv->lock);
@@ -1840,7 +1840,7 @@ static void c2h_wk_callback(struct work_struct *work)continue ; } -if (ccx_id_filter (c2h_evt) == true) { +if (ccx_id_filter (c2h_evt)) {/* Handle CCX report here */ rtw_hal_c2h_handler (adapter, c2h_evt);kfree (c2h_evt);
Signature · 1 line
2.25.1
PATCH v4 2/4 staging: rtl8723bs: core: Remove unnecessary parentheses
In reply to Kushal KothariIssue found with checkpatch.pl.
CHECK: Remove unnecessary parentheses
---
Changes in v4: Move the version notes
Changes in v3: Enclose the version number inside the square bracket. Changes in v2: Handled all previous parentheses in this patch
drivers/staging/rtl8723bs/core/rtw_cmd.c | 42 ++++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +21 -21
@@ -278,10 +278,10 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)/* spin_lock_bh(&(queue->lock)); */ spin_lock_irqsave (&queue->lock, irqL); -if (list_empty (&(queue->queue))) +if (list_empty (&queue->queue)) obj =NULL ;else { - obj = container_of(get_next(&(queue->queue)), struct cmd_obj, list); + obj = container_of(get_next(&queue->queue), struct cmd_obj, list);list_del_init (&obj->list); }
@@ -371,7 +371,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);
@@ -387,7 +387,7 @@ int rtw_cmd_thread(void *context)u8 (*cmd_hdl)(struct adapter *padapter,u8 *pbuf);void (*pcmd_callback)(struct adapter *dev,struct cmd_obj *pcmd);struct adapter *padapter = context; -struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); +struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct drvextra_cmd_parm *extra_parm =NULL ;thread_enter ("RTW_CMD_THREAD" );
@@ -395,7 +395,7 @@ int rtw_cmd_thread(void *context) pcmdbuf = pcmdpriv->cmd_buf; pcmdpriv->stop_req =0 ; -atomic_set (&(pcmdpriv->cmdthd_running), true); +atomic_set (&pcmdpriv->cmdthd_running, true);complete (&pcmdpriv->terminate_cmdthread_comp);while (1 ) {
@@ -471,7 +471,7 @@ int rtw_cmd_thread(void *context) post_process: -if (mutex_lock_interruptible (&(pcmd->padapter->cmdpriv.sctx_mutex)) ==0 ) { +if (mutex_lock_interruptible (&pcmd->padapter->cmdpriv.sctx_mutex) ==0 ) {if (pcmd->sctx) { netdev_dbg(padapter->pnetdev, FUNC_ADPT_FMT " pcmd->sctx\n",
@@ -482,7 +482,7 @@ int rtw_cmd_thread(void *context)else rtw_sctx_done_err (&pcmd->sctx,RTW_SCTX_DONE_CMD_ERROR ); } -mutex_unlock (&(pcmd->padapter->cmdpriv.sctx_mutex)); +mutex_unlock (&pcmd->padapter->cmdpriv.sctx_mutex); }/* call callback function for post-processed */
@@ -522,7 +522,7 @@ int rtw_cmd_thread(void *context) }while (1 );complete (&pcmdpriv->terminate_cmdthread_comp); -atomic_set (&(pcmdpriv->cmdthd_running), false); +atomic_set (&pcmdpriv->cmdthd_running, false);thread_exit (); }
@@ -724,7 +724,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)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); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u32 tmp_len;u8 *ptmp =NULL ;
@@ -1243,7 +1243,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)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);
@@ -1315,7 +1315,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)struct dvobj_priv *dvobj =adapter_to_dvobj (padapter);int n_assoc_iface =0 ; -if (check_fwstate (&(dvobj->padapters->mlmepriv),WIFI_ASOC_STATE )) +if (check_fwstate (&dvobj->padapters->mlmepriv,WIFI_ASOC_STATE )) n_assoc_iface++;if (!from_timer && n_assoc_iface ==0 )
@@ -1340,7 +1340,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter) {struct mlme_priv *pmlmepriv; - pmlmepriv = &(padapter->mlmepriv); + pmlmepriv = &padapter->mlmepriv;if (check_fwstate (pmlmepriv,WIFI_AP_STATE ))expire_timeout_chk (padapter);
@@ -1374,11 +1374,11 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type);void lps_ctrl_wk_hdl (struct adapter *padapter,u8 lps_ctrl_type) {struct pwrctrl_priv *pwrpriv =adapter_to_pwrctl (padapter); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 mstatus; -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ))) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {return ; }
@@ -1959,7 +1959,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)struct wlan_network *pwlan =NULL ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf; -struct wlan_network *tgt_network = &(pmlmepriv->cur_network); +struct wlan_network *tgt_network = &pmlmepriv->cur_network;if (!pcmd->parmbuf) goto exit;
@@ -1983,20 +1983,20 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)rtw_indicate_connect (padapter); }else { pwlan =rtw_alloc_network (pmlmepriv); -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock);if (!pwlan) { pwlan =rtw_get_oldest_wlan_network (&pmlmepriv->scanned_queue);if (!pwlan) { -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); goto createbss_cmd_fail; } pwlan->last_scanned = jiffies; }else { -list_add_tail (&(pwlan->list), &pmlmepriv->scanned_queue.queue); +list_add_tail (&pwlan->list, &pmlmepriv->scanned_queue.queue); } pnetwork->length =get_wlan_bssid_ex_sz (pnetwork); -memcpy (&(pwlan->network), pnetwork, pnetwork->length); +memcpy (&pwlan->network, pnetwork, pnetwork->length);/* pwlan->fixed = true; */ /* list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); */
@@ -2009,7 +2009,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING); -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock);/* we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */ }
Signature · 1 line
2.25.1
PATCH v4 3/4 staging: rtl8723bs: core: Remove unnecessary space after a cast
In reply to Kushal KothariRemove useless space after cast
---
Changes in v4: Move the version notes
Changes in v3: Enclose the version number inside the square bracket. Changes in v2: No changes
drivers/staging/rtl8723bs/core/rtw_cmd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +5 -5
@@ -922,7 +922,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_memcpy (psetstakey_para->addr, sta->hwaddr,ETH_ALEN );if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) - psetstakey_para->algorithm = (unsigned char ) psecuritypriv->dot11PrivacyAlgrthm; + psetstakey_para->algorithm = (unsigned char )psecuritypriv->dot11PrivacyAlgrthm;else GET_ENCRY_ALGO (psecuritypriv, sta, psetstakey_para->algorithm, false);
@@ -951,7 +951,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_ }init_h2fwcmd_w_parm_no_rsp (ph2c, psetstakey_para, _SetStaKey_CMD_); - ph2c->rsp = (u8 *) psetstakey_rsp; + ph2c->rsp = (u8 *)psetstakey_rsp; ph2c->rspsz =sizeof (struct set_stakey_rsp ); res =rtw_enqueue_cmd (pcmdpriv, ph2c); }else {
@@ -1002,7 +1002,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu }init_h2fwcmd_w_parm_no_rsp (ph2c, psetstakey_para, _SetStaKey_CMD_); - ph2c->rsp = (u8 *) psetstakey_rsp; + ph2c->rsp = (u8 *)psetstakey_rsp; ph2c->rspsz =sizeof (struct set_stakey_rsp );memcpy (psetstakey_para->addr, sta->hwaddr,ETH_ALEN );
@@ -2027,7 +2027,7 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pc {struct sta_priv *pstapriv = &padapter->stapriv; -struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *) (pcmd->rsp); +struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);struct sta_info *psta =rtw_get_stainfo (pstapriv, psetstakey_rsp->addr);if (!psta)
@@ -2042,7 +2042,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *struct sta_priv *pstapriv = &padapter->stapriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct set_assocsta_parm *passocsta_parm = (struct set_assocsta_parm *)(pcmd->parmbuf); -struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *) (pcmd->rsp); +struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp);struct sta_info *psta =rtw_get_stainfo (pstapriv, passocsta_parm->addr);if (!psta)
Signature · 1 line
2.25.1
PATCH v4 4/4 staging: rtl8723bs: core: Remove unnecessary blank lines
In reply to Kushal KothariRemove useless blank lines
---
Changes in v4: Move the version notes
Changes in v3: Enclose the version number inside the square bracket. Changes in v2: Removed whitespace errors
drivers/staging/rtl8723bs/core/rtw_cmd.c | 26 ------------------------ 1 file changed, 26 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +0 -26
@@ -316,8 +316,6 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)return _SUCCESS; } - -int rtw_enqueue_cmd (struct cmd_priv *pcmdpriv,struct cmd_obj *cmd_obj) {int res = _FAIL;
@@ -367,7 +365,6 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd)kfree (pcmd); } -void rtw_stop_cmd_thread (struct adapter *adapter) { if (adapter->cmdThread &&
@@ -497,11 +494,8 @@ int rtw_cmd_thread(void *context) }else {rtw_free_cmd_obj (pcmd); } -flush_signals_thread (); - goto _next; - }/* free all cmd_obj resources */
@@ -591,7 +585,6 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, res =rtw_enqueue_cmd (pcmdpriv, ph2c);if (res == _SUCCESS) { - pmlmepriv->scan_start_time = jiffies;_set_timer (&pmlmepriv->scan_to_timer,SCANNING_TIMEOUT ); }else {
@@ -752,7 +745,6 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)case Ndis802_11AutoUnknown:case Ndis802_11InfrastructureMax:break ; - } }
@@ -1010,9 +1002,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu psetstakey_para->algorithm = _NO_PRIVACY_; res =rtw_enqueue_cmd (pcmdpriv, ph2c); - } - exit:return res; }
@@ -1080,7 +1070,6 @@ u8 rtw_reset_securitypriv_cmd(struct adapter *padapter)/* rtw_enqueue_cmd(pcmdpriv, ph2c); */ res =rtw_enqueue_cmd (pcmdpriv, ph2c); - exit:return res; }
@@ -1112,10 +1101,8 @@ u8 rtw_free_assoc_resources_cmd(struct adapter *padapter)init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm,GEN_CMD_CODE (_Set_Drv_Extra)); -/* rtw_enqueue_cmd(pcmdpriv, ph2c); */ res =rtw_enqueue_cmd (pcmdpriv, ph2c); - exit:return res; }
@@ -1150,7 +1137,6 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)/* rtw_enqueue_cmd(pcmdpriv, ph2c); */ res =rtw_enqueue_cmd (pcmdpriv, ph2c); - exit:return res; }
@@ -1347,14 +1333,11 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter)/* for debug purpose */ _linked_info_dump (padapter); - -/* if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY) ==false) */ {linked_status_chk (padapter);traffic_status_watchdog (padapter,0 ); } -rtw_hal_dm_watchdog (padapter);/* check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type); */
@@ -1500,9 +1483,7 @@ u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter) res =rtw_enqueue_cmd (pcmdpriv, ph2c); exit: -return res; - }static void rtw_lps_change_dtim_hdl (struct adapter *padapter,u8 dtim)
@@ -1542,7 +1523,6 @@ u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c =rtw_zmalloc (sizeof (struct cmd_obj ));if (!ph2c) { res = _FAIL;
@@ -1577,7 +1557,6 @@ u8 rtw_ps_cmd(struct adapter *padapter)struct drvextra_cmd_parm *pdrvextra_cmd_parm;struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ppscmd =rtw_zmalloc (sizeof (struct cmd_obj ));if (!ppscmd) { res = _FAIL;
@@ -1673,9 +1652,7 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter) res =rtw_enqueue_cmd (pcmdpriv, ph2c); exit: -return res; - }struct btinfo {
@@ -2021,11 +1998,8 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)rtw_free_cmd_obj (pcmd); } - -void rtw_setstaKey_cmdrsp_callback (struct adapter *padapter,struct cmd_obj *pcmd) { -struct sta_priv *pstapriv = &padapter->stapriv;struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);struct sta_info *psta =rtw_get_stainfo (pstapriv, psetstakey_rsp->addr);
Signature · 1 line
2.25.1
Re: [PATCH v4 3/4] staging: rtl8723bs: core: Remove unnecessary space after a cast
In reply to Kushal KothariThis v4 patchset look good. Thanks!
drivers/staging/rtl8723bs/core/rtw_cmd.c void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pc · line 2030
Quoted 6 lines · Kushal Kothari
drivers/staging/rtl8723bs/core/rtw_cmd.c +1
-1@@ -2027,7 +2027,7 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pc {struct sta_priv *pstapriv = &padapter->stapriv; -struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *) (pcmd->rsp); +struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);
^^^^^^^^^^^
An unrelated note, if you wanted to send more patches. These extra parentheses could be removed.
drivers/staging/rtl8723bs/core/rtw_cmd.c void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj * · line 2044
Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_cmd.c +0
-0struct sta_info *psta =rtw_get_stainfo (pstapriv, psetstakey_rsp->addr);if (!psta)@@ -2042,7 +2042,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *struct sta_priv *pstapriv = &padapter->stapriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct set_assocsta_parm *passocsta_parm = (struct set_assocsta_parm *)(pcmd->parmbuf);
^^^^^^^^^^^^^^^
Same here.
drivers/staging/rtl8723bs/core/rtw_cmd.c void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj * · line 2045
Quoted 2 lines
drivers/staging/rtl8723bs/core/rtw_cmd.c +1
-1-struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *) (pcmd->rsp); +struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp);
^^^^^^^^^^^^
Here.
drivers/staging/rtl8723bs/core/rtw_cmd.c void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj * · line 2048
Quoted 3 lines
drivers/staging/rtl8723bs/core/rtw_cmd.c +0
-0struct sta_info *psta =rtw_get_stainfo (pstapriv, passocsta_parm->addr);if (!psta)
regards,
dan carpenter
Re: [PATCH v4 1/4] staging: rtl8723bs: core: Remove true and false comparison
In reply to Kushal Kotharidrivers/staging/rtl8723bs/core/rtw_cmd.c void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) · line 1383
Quoted 10 lines · Kushal Kothari
drivers/staging/rtl8723bs/core/rtw_cmd.c +2
-2struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);u8 mstatus; -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) - || (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) { +if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) || + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ))) {return ; }
This is a "let it slide" moment.
Normally would keep my mouth shut but we had already discussed it a bit and it's really important to know the rules. In your original patch you did this correctly, and then a reviewer made a comment about a different set of parentheses and you modified this one as well so now it's wrong. The extra parens get removed in [PATCH 2/2] so, whatever, it's fine.
The rule is that if you change a line of code you are allowed to make small changes to fix the style to make checkpatch happy about *THAT LINE*. It's not required. Try to avoid making too many unrelated changes if it's going to make reviewing difficult.
But I don't want to see three patches fixing the style for a single line of code. You can take it too far in either direction. We had a guy who was re-writing all the error handling for a function but he would do it in 5 to 8 patches. It was crazy hard to review. He introduced a lot of bugs as well. It would have been easier to review as one patch.
But if you change a line and your change introduces a checkpatch warning then you *must* change the line. So here, removing the == true, means you *must* remove the extra parentheses.
But it's fine. Now you know the rules and can do correctly going forward.
regards,
dan carpenter