diff options
| author | navin patidar <navin.patidar@gmail.com> | 2014-07-10 09:12:25 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 21:15:21 -0700 |
| commit | ace050139cee44d06b06b4c78074b4eb80fb7c0a (patch) | |
| tree | af8bcb10859c00cb4be35a3703b9440e660cfb6a /drivers/staging/rtl8188eu | |
| parent | 788253860c21f4e40add556d7ed715fefb2bafb3 (diff) | |
| download | blackbird-op-linux-ace050139cee44d06b06b4c78074b4eb80fb7c0a.tar.gz blackbird-op-linux-ace050139cee44d06b06b4c78074b4eb80fb7c0a.zip | |
staging: rtl8188eu: Use msecs_to_jiffies() instead of rtw_ms_to_systime()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 10 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/include/osdep_service.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c index 439bc8f70d03..27ed83cca193 100644 --- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c @@ -551,7 +551,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms) { struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; - pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ms); + pwrpriv->ips_deny_time = jiffies + msecs_to_jiffies(ms); } /* @@ -568,9 +568,9 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal unsigned long expires; int ret = _SUCCESS; - expires = jiffies + rtw_ms_to_systime(ips_deffer_ms); + expires = jiffies + msecs_to_jiffies(ips_deffer_ms); if (time_before(pwrpriv->ips_deny_time, expires)) - pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms); + pwrpriv->ips_deny_time = jiffies + msecs_to_jiffies(ips_deffer_ms); { u32 start = jiffies; @@ -624,9 +624,9 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal } exit: - expires = jiffies + rtw_ms_to_systime(ips_deffer_ms); + expires = jiffies + msecs_to_jiffies(ips_deffer_ms); if (time_before(pwrpriv->ips_deny_time, expires)) - pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms); + pwrpriv->ips_deny_time = jiffies + msecs_to_jiffies(ips_deffer_ms); return ret; } diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h b/drivers/staging/rtl8188eu/include/osdep_service.h index 3ddaa34c761a..238930c7d430 100644 --- a/drivers/staging/rtl8188eu/include/osdep_service.h +++ b/drivers/staging/rtl8188eu/include/osdep_service.h @@ -154,7 +154,6 @@ u32 _rtw_down_sema(struct semaphore *sema); void _rtw_init_queue(struct __queue *pqueue); -u32 rtw_ms_to_systime(u32 ms); s32 rtw_get_passing_time_ms(u32 start); struct rtw_netdev_priv_indicator { diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c b/drivers/staging/rtl8188eu/os_dep/osdep_service.c index 96f8eb88b06d..db6ee3103e24 100644 --- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c +++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c @@ -77,11 +77,6 @@ void _rtw_init_queue(struct __queue *pqueue) spin_lock_init(&(pqueue->lock)); } -inline u32 rtw_ms_to_systime(u32 ms) -{ - return ms * HZ / 1000; -} - /* the input parameter start must be in jiffies */ inline s32 rtw_get_passing_time_ms(u32 start) { |
