From 609fff0d67e5c5e782b5450831d5001ae7925f0d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 12 Dec 2014 22:51:56 -0600 Subject: [PATCH] rtl8188eu: Remove wrapper around semaphore 'up' Signed-off-by: Larry Finger --- core/rtw_cmd.c | 8 ++++---- include/osdep_service.h | 1 - include/rtw_pwrctrl.h | 2 +- os_dep/os_intfs.c | 2 +- os_dep/osdep_service.c | 5 ----- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 7ecb3e4..106b90a 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -238,7 +238,7 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) 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: @@ -258,7 +258,7 @@ void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv) { pcmdpriv->cmd_done_cnt++; - /* _rtw_up_sema(&(pcmdpriv->cmd_done_sema)); */ + /* up(&(pcmdpriv->cmd_done_sema)); */ } @@ -297,7 +297,7 @@ int rtw_cmd_thread(void *context) 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")); @@ -383,7 +383,7 @@ post_process: rtw_free_cmd_obj(pcmd); } while (1); - _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema); + up(&pcmdpriv->terminate_cmdthread_sema); thread_exit(); } diff --git a/include/osdep_service.h b/include/osdep_service.h index 055f66f..d605ae0 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -268,7 +268,6 @@ 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_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); diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index d4b8acb..995a3b2 100644 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -114,7 +114,7 @@ static inline void _enter_pwrlock(struct semaphore *plock) static inline void _exit_pwrlock(struct semaphore *plock) { - _rtw_up_sema(plock); + up(plock); } #define LPS_DELAY_TIME 1*HZ /* 1 sec */ diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index d503881..cd681d0 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -771,7 +771,7 @@ void rtw_stop_drv_threads(struct adapter *padapter) RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads\n")); /* Below is to termindate rtw_cmd_thread & event_thread... */ - _rtw_up_sema(&padapter->cmdpriv.cmd_queue_sema); + up(&padapter->cmdpriv.cmd_queue_sema); if (padapter->cmdThread) _rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema); diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 0e61f72..f5438a9 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -164,11 +164,6 @@ void _rtw_free_sema(struct semaphore *sema) { } -void _rtw_up_sema(struct semaphore *sema) -{ - up(sema); -} - u32 _rtw_down_sema(struct semaphore *sema) { if (down_interruptible(sema))