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

staging: r8188eu: Replace wrapper around sema_init 



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

drivers/staging/rtl8188eu/core/rtw_cmd.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -38,9 +38,9 @@ int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv) 




_func_enter_;

_func_enter_;





	_rtw_init_sema(&(pcmdpriv->cmd_queue_sema), 0);

	sema_init(&(pcmdpriv->cmd_queue_sema), 0);

	/* _rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0); */

	/* sema_init(&(pcmdpriv->cmd_done_sema), 0); */

	_rtw_init_sema(&(pcmdpriv->terminate_cmdthread_sema), 0);

	sema_init(&(pcmdpriv->terminate_cmdthread_sema), 0);









	_rtw_init_queue(&(pcmdpriv->cmd_queue));

	_rtw_init_queue(&(pcmdpriv->cmd_queue));

drivers/staging/rtl8188eu/core/rtw_recv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ _func_enter_; 
	}

	}

	precvpriv->rx_pending_cnt = 1;

	precvpriv->rx_pending_cnt = 1;





	_rtw_init_sema(&precvpriv->allrxreturnevt, 0);

	sema_init(&precvpriv->allrxreturnevt, 0);





	res = rtw_hal_init_recv_priv(padapter);

	res = rtw_hal_init_recv_priv(padapter);

drivers/staging/rtl8188eu/core/rtw_xmit.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -68,8 +68,8 @@ _func_enter_; 
	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */

	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */





	spin_lock_init(&pxmitpriv->lock);

	spin_lock_init(&pxmitpriv->lock);

	_rtw_init_sema(&pxmitpriv->xmit_sema, 0);

	sema_init(&pxmitpriv->xmit_sema, 0);

	_rtw_init_sema(&pxmitpriv->terminate_xmitthread_sema, 0);

	sema_init(&pxmitpriv->terminate_xmitthread_sema, 0);





	/*

	/*

	Please insert all the queue initializaiton using _rtw_init_queue below

	Please insert all the queue initializaiton using _rtw_init_queue below
@@ -210,7 +210,7 @@ _func_enter_; 




	pxmitpriv->txirp_cnt = 1;

	pxmitpriv->txirp_cnt = 1;





	_rtw_init_sema(&(pxmitpriv->tx_retevt), 0);

	sema_init(&(pxmitpriv->tx_retevt), 0);





	/* per AC pending irp */

	/* per AC pending irp */

	pxmitpriv->beq_cnt = 0;

	pxmitpriv->beq_cnt = 0;

drivers/staging/rtl8188eu/include/osdep_service.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -256,7 +256,6 @@ 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_insert_tail(struct list_head *plist, struct list_head *phead);

void rtw_list_delete(struct list_head *plist);

void rtw_list_delete(struct list_head *plist);





void _rtw_init_sema(struct semaphore *sema, int init_val);

void _rtw_free_sema(struct semaphore *sema);

void _rtw_free_sema(struct semaphore *sema);

void _rtw_up_sema(struct semaphore *sema);

void _rtw_up_sema(struct semaphore *sema);

u32  _rtw_down_sema(struct semaphore *sema);

u32  _rtw_down_sema(struct semaphore *sema);

drivers/staging/rtl8188eu/include/rtw_pwrctrl.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ struct reportpwrstate_parm { 




static inline void _init_pwrlock(struct semaphore  *plock)

static inline void _init_pwrlock(struct semaphore  *plock)

{

{

	_rtw_init_sema(plock, 1);

	sema_init(plock, 1);

}

}





static inline void _free_pwrlock(struct semaphore  *plock)

static inline void _free_pwrlock(struct semaphore  *plock)