Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ace05013 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Use msecs_to_jiffies() instead of rtw_ms_to_systime() 



Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78825386

drivers/staging/rtl8188eu/core/rtw_pwrctrl.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/rtl8188eu/include/osdep_service.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/staging/rtl8188eu/os_dep/osdep_service.c

+0 −5
Original line number Diff line number Diff line
@@ -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)

{