From 89552a85d01782764feb0387a01d4bd6f6f50a3d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 6 Mar 2015 16:48:54 -0600 Subject: [PATCH] rtl8188eu: Remove _rtw_spinlock_free This routine does nothing. Signed-off-by: Larry Finger --- core/rtw_ap.c | 4 ---- core/rtw_cmd.c | 2 -- core/rtw_mlme.c | 3 --- core/rtw_recv.c | 8 ------- core/rtw_sta_mgt.c | 50 ----------------------------------------- core/rtw_xmit.c | 18 --------------- include/osdep_service.h | 1 - os_dep/os_intfs.c | 5 ----- os_dep/osdep_service.c | 4 ---- 9 files changed, 95 deletions(-) diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 9cc2cee..64f8707 100755 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -77,8 +77,6 @@ void free_mlme_ap_info(struct adapter *padapter) spin_lock_bh(&(pstapriv->sta_hash_lock)); rtw_free_stainfo(padapter, psta); spin_unlock_bh(&(pstapriv->sta_hash_lock)); - _rtw_spinlock_free(&pmlmepriv->bcn_update_lock); - } static void update_BCNTIM(struct adapter *padapter) @@ -2340,8 +2338,6 @@ void stop_ap_mode(struct adapter *padapter) pmlmepriv->update_bcn = false; pmlmeext->bstart_bss = false; - /* _rtw_spinlock_free(&pmlmepriv->bcn_update_lock); */ - /* reset and init security priv , this can refine with rtw_reset_securitypriv */ memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv)); padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index ff17116..82134f1 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -173,9 +173,7 @@ void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) ; if(pcmdpriv){ - _rtw_spinlock_free(&(pcmdpriv->cmd_queue.lock)); _rtw_free_sema(&(pcmdpriv->cmd_queue_sema)); - /* _rtw_free_sema(&(pcmdpriv->cmd_done_sema)); */ _rtw_free_sema(&(pcmdpriv->terminate_cmdthread_sema)); if (pcmdpriv->cmd_allocated_buf) diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 1046311..d6b4125 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -99,9 +99,6 @@ exit: void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv) { - _rtw_spinlock_free(&pmlmepriv->lock); - _rtw_spinlock_free(&(pmlmepriv->free_bss_pool.lock)); - _rtw_spinlock_free(&(pmlmepriv->scanned_queue.lock)); } static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen) diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 1aac044..2c4018e 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -130,24 +130,16 @@ exit: void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv); void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv) { - _rtw_spinlock_free(&precvpriv->lock); #ifdef CONFIG_RECV_THREAD_MODE _rtw_free_sema(&precvpriv->recv_sema); _rtw_free_sema(&precvpriv->terminate_recvthread_sema); #endif - - _rtw_spinlock_free(&precvpriv->free_recv_queue.lock); - _rtw_spinlock_free(&precvpriv->recv_pending_queue.lock); - - _rtw_spinlock_free(&precvpriv->free_recv_buf_queue.lock); } void _rtw_free_recv_priv (struct recv_priv *precvpriv) { struct adapter *padapter = precvpriv->adapter; -; - rtw_free_uc_swdec_pending_queue(padapter); rtw_mfree_recv_priv_lock(precvpriv); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 6d2840f..1dcf207 100755 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -172,44 +172,18 @@ inline struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int return (struct sta_info *)(stapriv->pstainfo_buf + offset * sizeof(struct sta_info)); } -void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv); void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv) { -; - - _rtw_spinlock_free(&psta_xmitpriv->lock); - - _rtw_spinlock_free(&(psta_xmitpriv->be_q.sta_pending.lock)); - _rtw_spinlock_free(&(psta_xmitpriv->bk_q.sta_pending.lock)); - _rtw_spinlock_free(&(psta_xmitpriv->vi_q.sta_pending.lock)); - _rtw_spinlock_free(&(psta_xmitpriv->vo_q.sta_pending.lock)); -; } static void _rtw_free_sta_recv_priv_lock(struct sta_recv_priv *psta_recvpriv) { -; - - _rtw_spinlock_free(&psta_recvpriv->lock); - - _rtw_spinlock_free(&(psta_recvpriv->defrag_q.lock)); - -; - } -void rtw_mfree_stainfo(struct sta_info *psta); void rtw_mfree_stainfo(struct sta_info *psta) { -; - - if(&psta->lock != NULL) - _rtw_spinlock_free(&psta->lock); - _rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv); _rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv); - -; } @@ -250,19 +224,6 @@ void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv) #endif rtw_mfree_all_stainfo(pstapriv); /* be done before free sta_hash_lock */ - - _rtw_spinlock_free(&pstapriv->free_sta_queue.lock); - - _rtw_spinlock_free(&pstapriv->sta_hash_lock); - _rtw_spinlock_free(&pstapriv->wakeup_q.lock); - _rtw_spinlock_free(&pstapriv->sleep_q.lock); - -#ifdef CONFIG_AP_MODE - _rtw_spinlock_free(&pstapriv->asoc_list_lock); - _rtw_spinlock_free(&pstapriv->auth_list_lock); - _rtw_spinlock_free(&pacl_list->acl_node_q.lock); -#endif - } u32 _rtw_free_sta_priv(struct sta_priv *pstapriv) @@ -273,9 +234,7 @@ 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++) @@ -561,18 +520,9 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta) #endif /* CONFIG_AP_MODE */ - _rtw_spinlock_free(&psta->lock); - - /* spin_lock_bh(&(pfree_sta_queue->lock)0); */ rtw_list_insert_tail(&psta->list, get_list_head(pfree_sta_queue)); - /* spin_unlock_bh(&(pfree_sta_queue->lock)0); */ - exit: - -; - return _SUCCESS; - } /* free all stainfo which in sta_hash[all] */ diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 8b33e99..8665e7b 100755 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -307,25 +307,10 @@ exit: return res; } -void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv); void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv) { - _rtw_spinlock_free(&pxmitpriv->lock); _rtw_free_sema(&pxmitpriv->xmit_sema); _rtw_free_sema(&pxmitpriv->terminate_xmitthread_sema); - - _rtw_spinlock_free(&pxmitpriv->be_pending.lock); - _rtw_spinlock_free(&pxmitpriv->bk_pending.lock); - _rtw_spinlock_free(&pxmitpriv->vi_pending.lock); - _rtw_spinlock_free(&pxmitpriv->vo_pending.lock); - _rtw_spinlock_free(&pxmitpriv->bm_pending.lock); - - /* _rtw_spinlock_free(&pxmitpriv->legacy_dz_queue.lock); */ - /* _rtw_spinlock_free(&pxmitpriv->apsd_queue.lock); */ - - _rtw_spinlock_free(&pxmitpriv->free_xmit_queue.lock); - _rtw_spinlock_free(&pxmitpriv->free_xmitbuf_queue.lock); - _rtw_spinlock_free(&pxmitpriv->pending_xmitbuf_queue.lock); } @@ -382,11 +367,8 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv) } if (pxmitpriv->xframe_ext_alloc_addr) rtw_vmfree(pxmitpriv->xframe_ext_alloc_addr, num_xmit_extbuf * sizeof(struct xmit_frame) + 4); - _rtw_spinlock_free(&pxmitpriv->free_xframe_ext_queue.lock); /* free xmit extension buff */ - _rtw_spinlock_free(&pxmitpriv->free_xmit_extbuf_queue.lock); - pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf; for(i=0; isecurity_key_mutex); - -#ifdef CONFIG_BR_EXT - _rtw_spinlock_free(&padapter->br_ext_lock); -#endif /* CONFIG_BR_EXT */ free_mlme_ext_priv(&padapter->mlmeextpriv); diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index b644f28..8ce692c 100755 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -656,10 +656,6 @@ void _rtw_mutex_free(_mutex *pmutex) #endif } -void _rtw_spinlock_free(_lock *plock) -{ -} - void _rtw_init_queue(_queue *pqueue) {