redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

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>
wifi-calibration
navin patidar 2014-07-10 09:12:25 +05:30 committed by Greg Kroah-Hartman
parent 788253860c
commit ace050139c
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
View File

@ -551,7 +551,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms) inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; 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; unsigned long expires;
int ret = _SUCCESS; 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)) 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; u32 start = jiffies;
@ -624,9 +624,9 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
} }
exit: 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)) 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; return ret;
} }

1
drivers/staging/rtl8188eu/include/osdep_service.h
View File

@ -154,7 +154,6 @@ u32 _rtw_down_sema(struct semaphore *sema);
void _rtw_init_queue(struct __queue *pqueue); void _rtw_init_queue(struct __queue *pqueue);
u32 rtw_ms_to_systime(u32 ms);
s32 rtw_get_passing_time_ms(u32 start); s32 rtw_get_passing_time_ms(u32 start);
struct rtw_netdev_priv_indicator { struct rtw_netdev_priv_indicator {

5
drivers/staging/rtl8188eu/os_dep/osdep_service.c
View File

@ -77,11 +77,6 @@ void _rtw_init_queue(struct __queue *pqueue)
spin_lock_init(&(pqueue->lock)); 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 */ /* the input parameter start must be in jiffies */
inline s32 rtw_get_passing_time_ms(u32 start) inline s32 rtw_get_passing_time_ms(u32 start)
{ {