staging: rtl8188eu: remove exit label from rtw_alloc_stainfo
PATCH 1/4 staging: rtl8188eu: remove exit label from rtw_alloc_stainfo
Remove exit label from rtw_alloc_stainfo and simply return NULL instead of goto exit.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +2 -4
@@ -181,7 +181,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) struct sta_info, list);if (!psta) {spin_unlock_bh (&pfree_sta_queue->lock); - goto exit; +return NULL ; }list_del_init (&psta->list);
@@ -194,8 +194,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)if (index >=NUM_STA ) {RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("ERROR => %s: index >= NUM_STA" , __func__)); - psta =NULL ; - goto exit; +return NULL ; } phash_list = &pstapriv->sta_hash[index];
@@ -246,7 +245,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)/* init for the sequence number of received management frame */ psta->RxMgmtFrameSeqNum =0xffff ; -exit:return psta; }
Signature · 1 line
2.23.0
PATCH 2/4 staging: rtl8188eu: reduce indentation level in _rtw_free_sta_priv
Reduce indentation level in _rtw_free_sta_priv by returning early if pstapriv is NULL. Also clears a line over 80 characters checkpatch warning.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 43 ++++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +21 -22
@@ -135,31 +135,30 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)struct recv_reorder_ctrl *preorder_ctrl;int index; -if (pstapriv) { -/* delete all reordering_ctrl_timer */ -spin_lock_bh (&pstapriv->sta_hash_lock); -for (index =0 ; index <NUM_STA ; index++) { - phead = &pstapriv->sta_hash[index]; - plist = phead->next; - -while (phead != plist) { -int i; - - psta = container_of(plist, struct sta_info, - hash_list); - plist = plist->next; - -for (i =0 ; i <16 ; i++) { - preorder_ctrl = &psta->recvreorder_ctrl[i]; -del_timer_sync (&preorder_ctrl->reordering_ctrl_timer); - } +if (!pstapriv) +return _SUCCESS; + +/* delete all reordering_ctrl_timer */ +spin_lock_bh (&pstapriv->sta_hash_lock); +for (index =0 ; index <NUM_STA ; index++) { + phead = &pstapriv->sta_hash[index]; + plist = phead->next; + +while (phead != plist) { +int i; + + psta = container_of(plist, struct sta_info, hash_list); + plist = plist->next; + +for (i =0 ; i <16 ; i++) { + preorder_ctrl = &psta->recvreorder_ctrl[i]; +del_timer_sync (&preorder_ctrl->reordering_ctrl_timer); } } -spin_unlock_bh (&pstapriv->sta_hash_lock); -/*===============================*/ - -vfree (pstapriv->pallocated_stainfo_buf); } +spin_unlock_bh (&pstapriv->sta_hash_lock); + +vfree (pstapriv->pallocated_stainfo_buf);return _SUCCESS; }
Signature · 1 line
2.23.0
PATCH 3/4 staging: rtl8188eu: remove return variable from rtw_init_bcmc_stainfo
In reply to Michael StraubeRemove variable res, that is used to store the return value, from rtw_init_bcmc_stainfo. Instead return _FAIL or _SUCCESS directly and remove the now unneeded exit label.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +2 -5
@@ -451,24 +451,21 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)u32 rtw_init_bcmc_stainfo (struct adapter *padapter) {struct sta_info *psta; -u32 res = _SUCCESS;u8 bc_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };struct sta_priv *pstapriv = &padapter->stapriv; psta =rtw_alloc_stainfo (pstapriv, bc_addr);if (!psta) { - res = _FAIL;RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("rtw_alloc_stainfo fail" )); - goto exit; +return _FAIL; }/* default broadcast & multicast use macid 1 */ psta->mac_id =1 ; -exit: -return res; +return _SUCCESS; }struct sta_info *rtw_get_bcmc_stainfo (struct adapter *padapter)
Signature · 1 line
2.23.0
PATCH 4/4 staging: rtl8188eu: replace tabs with spaces - style
In reply to Michael StraubeReplace tabs with spaces where appropriate to cleanup whitespace.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +2 -2
@@ -167,7 +167,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) {s32 index;struct list_head *phash_list; -struct sta_info *psta; +struct sta_info *psta;struct __queue *pfree_sta_queue;struct recv_reorder_ctrl *preorder_ctrl;int i =0 ;
@@ -318,7 +318,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)spin_lock_bh (&ppending_recvframe_queue->lock); - phead =get_list_head (ppending_recvframe_queue); + phead =get_list_head (ppending_recvframe_queue); plist = phead->next;while (!list_empty (phead)) {
Signature · 1 line
2.23.0