Merge tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-drm-fsl-dcu.git] / drivers / staging / rtl8188eu / os_dep / os_intfs.c

diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index dd69e344e4099c852ffd0bd5ef11ef859a0e274c..68f98fa114d2ec5feb124533824fcebae59a374e 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -762,7 +762,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);
 
@@ -925,7 +925,7 @@ _func_enter_;
 
        rtw_hal_sreset_init(padapter);
 
-       _rtw_spinlock_init(&padapter->br_ext_lock);
+       spin_lock_init(&padapter->br_ext_lock);
 
 exit:
        RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw\n"));
@@ -978,9 +978,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
        }
        #endif
 
-
-       _rtw_spinlock_free(&padapter->br_ext_lock);
-
        free_mlme_ext_priv(&padapter->mlmeextpriv);
 
        rtw_free_cmd_priv(&padapter->cmdpriv);
@@ -994,8 +991,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
 
        _rtw_free_recv_priv(&padapter->recvpriv);
 
-       rtw_free_pwrctrl_priv(padapter);
-
        rtw_hal_free_data(padapter);
 
        RT_TRACE(_module_os_intfs_c_, _drv_info_, ("<== rtw_free_drv_sw\n"));
@@ -1158,7 +1153,7 @@ netdev_open_error:
 int rtw_ips_pwr_up(struct adapter *padapter)
 {
        int result;
-       u32 start_time = rtw_get_current_time();
+       u32 start_time = jiffies;
        DBG_88E("===>  rtw_ips_pwr_up..............\n");
        rtw_reset_drv_sw(padapter);
 
@@ -1172,7 +1167,7 @@ int rtw_ips_pwr_up(struct adapter *padapter)
 
 void rtw_ips_pwr_down(struct adapter *padapter)
 {
-       u32 start_time = rtw_get_current_time();
+       u32 start_time = jiffies;
        DBG_88E("===> rtw_ips_pwr_down...................\n");
 
        padapter->bCardDisableWOHSM = true;