staging: rtlwifi: rtlwifi: use ktime_get_real_seconds() for suspend time
PATCH 1/1 staging: rtlwifi: rtlwifi: use ktime_get_real_seconds() for suspend time
do_gettimeofday() is deprecated and slower than necessary for the purpose of reading the seconds. This changes rtl_op_suspend/resume to use ktime_get_real_seconds() instead, which is simpler and avoids confusion about whether it is y2038-safe or not.
Signed-off-by Arnd Bergmann <[email protected]>
---
This duplicates what I did for the regular (non-staging) rtlwifi driver
--- drivers/staging/rtlwifi/core.c | 8 ++------ drivers/staging/rtlwifi/wifi.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-)
drivers/staging/rtlwifi/core.c +2 -6
@@ -509,15 +509,13 @@ static int rtl_op_suspend(struct ieee80211_hw *hw,struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_hal *rtlhal =rtl_hal (rtlpriv);struct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw)); -struct timeval ts;RT_TRACE (rtlpriv,COMP_POWER ,DBG_DMESG ,"\n" );if (WARN_ON (!wow))return -EINVAL ;/* to resolve s4 can not wake up*/ -do_gettimeofday (&ts); - rtlhal->last_suspend_sec = ts.tv_sec; + rtlhal->last_suspend_sec =ktime_get_real_seconds ();if ((ppsc->wo_wlan_mode &WAKE_ON_PATTERN_MATCH ) && wow->n_patterns)_rtl_add_wowlan_patterns (hw, wow);
@@ -536,7 +534,6 @@ static int rtl_op_resume(struct ieee80211_hw *hw)struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_hal *rtlhal =rtl_hal (rtlpriv);struct rtl_mac *mac =rtl_mac (rtl_priv (hw)); -struct timeval ts;RT_TRACE (rtlpriv,COMP_POWER ,DBG_DMESG ,"\n" ); rtlhal->driver_is_goingto_unload = false;
@@ -544,8 +541,7 @@ static int rtl_op_resume(struct ieee80211_hw *hw) rtlhal->wake_from_pnp_sleep = true;/* to resovle s4 can not wake up*/ -do_gettimeofday (&ts); -if (ts.tv_sec - rtlhal->last_suspend_sec <5 ) +if (ktime_get_real_seconds () - rtlhal->last_suspend_sec <5 )return -1 ;rtl_op_start (hw);
drivers/staging/rtlwifi/wifi.h +1 -1
@@ -1670,7 +1670,7 @@ struct rtl_hal {bool enter_pnp_sleep;bool wake_from_pnp_sleep;bool wow_enabled; -__kernel_time_t last_suspend_sec; +time64_t last_suspend_sec;u32 wowlan_fwsize;u8 *wowlan_firmware;
Signature · 1 line
2.9.0