Commit 2ca4ab53 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Remove wrappers _rtw_free_sema, _rtw_up_sema, and _rtw_mutex_init 



Any routines that are empty as a result of these changes are also removed.

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

drivers/staging/rtl8188eu/core/rtw_cmd.c

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



	if (pcmdpriv) {

		_rtw_free_sema(&(pcmdpriv->cmd_queue_sema));

		_rtw_free_sema(&(pcmdpriv->terminate_cmdthread_sema));



		if (pcmdpriv->cmd_allocated_buf)

			kfree(pcmdpriv->cmd_allocated_buf);
@@ -257,7 +254,7 @@ _func_enter_; 
	res = _rtw_enqueue_cmd(&pcmdpriv->cmd_queue, cmd_obj);



	if (res == _SUCCESS)

		_rtw_up_sema(&pcmdpriv->cmd_queue_sema);

		up(&pcmdpriv->cmd_queue_sema);



exit:
@@ -282,7 +279,7 @@ void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv) 
{

_func_enter_;

	pcmdpriv->cmd_done_cnt++;

	/* _rtw_up_sema(&(pcmdpriv->cmd_done_sema)); */

	/* up(&(pcmdpriv->cmd_done_sema)); */

_func_exit_;

}
@@ -325,7 +322,7 @@ _func_enter_; 
	pcmdbuf = pcmdpriv->cmd_buf;



	pcmdpriv->cmdthd_running = true;

	_rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema);

	up(&pcmdpriv->terminate_cmdthread_sema);



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("start r871x rtw_cmd_thread !!!!\n"));
@@ -411,7 +408,7 @@ _func_enter_; 
		rtw_free_cmd_obj(pcmd);

	} while (1);



	_rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema);

	up(&pcmdpriv->terminate_cmdthread_sema);



_func_exit_;

drivers/staging/rtl8188eu/core/rtw_pwrctrl.c

+0 −7
Original line number Diff line number Diff line
@@ -524,13 +524,6 @@ _func_exit_; 


void rtw_free_pwrctrl_priv(struct adapter *adapter)

{

	struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv;



_func_enter_;



	_free_pwrlock(&pwrctrlpriv->lock);



_func_exit_;

}



u8 rtw_interface_ps_func(struct adapter *padapter, enum hal_intf_ps_func efunc_id, u8 *val)

drivers/staging/rtl8188eu/core/rtw_sreset.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void sreset_init_value(struct adapter *padapter) 
	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);

	struct sreset_priv *psrtpriv = &pHalData->srestpriv;



	_rtw_mutex_init(&psrtpriv->silentreset_mutex);

	mutex_init(&psrtpriv->silentreset_mutex);

	psrtpriv->silent_reset_inprogress = false;

	psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;

	psrtpriv->last_tx_time = 0;

drivers/staging/rtl8188eu/core/rtw_xmit.c

+1 −9
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ _func_enter_; 
	pxmitpriv->voq_cnt = 0;



	pxmitpriv->ack_tx = false;

	_rtw_mutex_init(&pxmitpriv->ack_tx_mutex);

	mutex_init(&pxmitpriv->ack_tx_mutex);

	rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0);



	rtw_hal_init_xmit_priv(padapter);
@@ -231,12 +231,6 @@ _func_exit_; 
	return res;

}



static void  rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv)

{

	_rtw_free_sema(&pxmitpriv->xmit_sema);

	_rtw_free_sema(&pxmitpriv->terminate_xmitthread_sema);

}



void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)

{

	int i;
@@ -250,8 +244,6 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv) 


	rtw_hal_free_xmit_priv(padapter);



	rtw_mfree_xmit_priv_lock(pxmitpriv);



	if (pxmitpriv->pxmit_frame_buf == NULL)

		goto out;

drivers/staging/rtl8188eu/include/osdep_service.h

+0 −3
Original line number Diff line number Diff line
@@ -256,10 +256,7 @@ void rtw_list_insert_head(struct list_head *plist, struct list_head *phead); 
void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead);

void rtw_list_delete(struct list_head *plist);



void _rtw_free_sema(struct semaphore *sema);

void _rtw_up_sema(struct semaphore *sema);

u32  _rtw_down_sema(struct semaphore *sema);

void _rtw_mutex_init(struct mutex *pmutex);

void _rtw_mutex_free(struct mutex *pmutex);



void _rtw_init_queue(struct __queue *pqueue);