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

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
...@@ -38,9 +38,9 @@ int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv) ...@@ -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));
......
...@@ -102,7 +102,7 @@ _func_enter_; ...@@ -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);
......
...@@ -68,8 +68,8 @@ _func_enter_; ...@@ -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_; ...@@ -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;
......
...@@ -256,7 +256,6 @@ void rtw_list_insert_head(struct list_head *plist, struct list_head *phead); ...@@ -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);
......
...@@ -99,7 +99,7 @@ struct reportpwrstate_parm { ...@@ -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)
......
...@@ -161,11 +161,6 @@ void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead) ...@@ -161,11 +161,6 @@ void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead)
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)
{ {
} }
......
...@@ -240,7 +240,7 @@ _func_enter_; ...@@ -240,7 +240,7 @@ _func_enter_;
} }
/* 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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment