rtl8188eu: Remove wrapper around init_sema()

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-13 15:25:08 -06:00
parent 61690cbca6
commit 890e54b7a7
7 changed files with 9 additions and 15 deletions

View file

@ -36,9 +36,9 @@ int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv)
{ {
int res = _SUCCESS; int res = _SUCCESS;
_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));

View file

@ -99,7 +99,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
} }
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);

View file

@ -65,8 +65,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
/* 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
@ -207,7 +207,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
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;

View file

@ -250,7 +250,6 @@ void _rtw_mfree(u8 *pbuf, u32 sz);
void *rtw_malloc2d(int h, int w, int size); void *rtw_malloc2d(int h, int w, int size);
void rtw_mfree2d(void *pbuf, int h, int w, int size); void rtw_mfree2d(void *pbuf, int h, int w, int size);
void _rtw_init_sema(struct semaphore *sema, int init_val);
void _rtw_free_sema(struct semaphore *sema); void _rtw_free_sema(struct semaphore *sema);
u32 _rtw_down_sema(struct semaphore *sema); u32 _rtw_down_sema(struct semaphore *sema);
void _rtw_mutex_init(struct mutex *pmutex); void _rtw_mutex_init(struct mutex *pmutex);

View file

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

View file

@ -122,11 +122,6 @@ Otherwise, there will be racing condition.
Caller must check if the list is empty before calling rtw_list_delete Caller must check if the list is empty before calling rtw_list_delete
*/ */
void _rtw_init_sema(struct semaphore *sema, int init_val)
{
sema_init(sema, init_val);
}
void _rtw_free_sema(struct semaphore *sema) void _rtw_free_sema(struct semaphore *sema)
{ {
} }

View file

@ -219,7 +219,7 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
} }
/* 3 misc */ /* 3 misc */
_rtw_init_sema(&(pdvobjpriv->usb_suspend_sema), 0); sema_init(&(pdvobjpriv->usb_suspend_sema), 0);
rtw_reset_continual_urb_error(pdvobjpriv); rtw_reset_continual_urb_error(pdvobjpriv);
usb_get_dev(pusbd); usb_get_dev(pusbd);