Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03f4a957 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Remove calls to _rtw_spinlock_free 



This wrapper does nothing on Linux. When calls to it were removed, a number of
routines became empty and could also be removed.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f214e521

drivers/staging/rtl8188eu/core/rtw_ap.c

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,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)

drivers/staging/rtl8188eu/core/rtw_cmd.c

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) 
_func_enter_;



	if (pcmdpriv) {

		_rtw_spinlock_free(&(pcmdpriv->cmd_queue.lock));

		_rtw_free_sema(&(pcmdpriv->cmd_queue_sema));

		_rtw_free_sema(&(pcmdpriv->terminate_cmdthread_sema));

drivers/staging/rtl8188eu/core/rtw_mlme.c

+0 −9
Original line number Diff line number Diff line
@@ -93,13 +93,6 @@ _func_exit_; 
	return res;

}



static 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));

}



#if defined (CONFIG_88EU_AP_MODE)

static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen)

{
@@ -136,8 +129,6 @@ _func_enter_; 
	rtw_free_mlme_priv_ie_data(pmlmepriv);



	if (pmlmepriv) {

		rtw_mfree_mlme_priv_lock (pmlmepriv);



		if (pmlmepriv->free_bss_buf) {

			rtw_vmfree(pmlmepriv->free_bss_buf, MAX_BSS_CNT * sizeof(struct wlan_network));

		}

drivers/staging/rtl8188eu/core/rtw_recv.c

+0 −11
Original line number Diff line number Diff line
@@ -118,15 +118,6 @@ _func_exit_; 
	return res;

}



static void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv)

{

	_rtw_spinlock_free(&precvpriv->lock);

	_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;
@@ -135,8 +126,6 @@ _func_enter_; 


	rtw_free_uc_swdec_pending_queue(padapter);



	rtw_mfree_recv_priv_lock(precvpriv);



	rtw_os_recv_resource_free(precvpriv);



	if (precvpriv->pallocated_frame_buf) {

drivers/staging/rtl8188eu/core/rtw_sta_mgt.c

+0 −55
Original line number Diff line number Diff line
@@ -148,47 +148,7 @@ 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)

{

_func_enter_;



	_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));

_func_exit_;

}



static void	_rtw_free_sta_recv_priv_lock(struct sta_recv_priv *psta_recvpriv)

{

_func_enter_;



	_rtw_spinlock_free(&psta_recvpriv->lock);



	_rtw_spinlock_free(&(psta_recvpriv->defrag_q.lock));



_func_exit_;

}



void rtw_mfree_stainfo(struct sta_info *psta);

void rtw_mfree_stainfo(struct sta_info *psta)

{

_func_enter_;



	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);



_func_exit_;

}



/*  this function is used to free the memory of lock || sema for all stainfos */

void rtw_mfree_all_stainfo(struct sta_priv *pstapriv);

void rtw_mfree_all_stainfo(struct sta_priv *pstapriv)

{

	struct list_head *plist, *phead;
@@ -204,8 +164,6 @@ _func_enter_; 
	while ((rtw_end_of_queue_search(phead, plist)) == false) {

		psta = LIST_CONTAINOR(plist, struct sta_info , list);

		plist = get_next(plist);



		rtw_mfree_stainfo(psta);

	}



	spin_unlock_bh(&pstapriv->sta_hash_lock);
@@ -218,20 +176,7 @@ static void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv) 
#ifdef CONFIG_88EU_AP_MODE

	struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;

#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_88EU_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)