From: Gujulan Elango, Hari Prasath (H.) Date: Fri, 8 May 2015 07:58:43 +0000 (+0000) Subject: staging: rtl8192e: Use time_after macro X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b68cecbedd5a66112b06ca22dce1ea06473b37b9;p=linux-beck.git staging: rtl8192e: Use time_after macro This patch replaces a condition check for time elapsed with a simple time_after macro Signed-off-by: Hari Prasath Gujulan Elango Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c index 0bbffec0c2ae..840dda962f90 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -28,6 +28,7 @@ #include "r8192E_phyreg.h" #include "r8190P_rtl8256.h" /* RTL8225 Radio frontend */ #include "r8192E_cmdpkt.h" +#include static void rtl8192_hw_sleep_down(struct net_device *dev) { @@ -93,6 +94,7 @@ void rtl8192_hw_to_sleep(struct net_device *dev, u64 time) u32 tmp; unsigned long flags; + unsigned long timeout; spin_lock_irqsave(&priv->ps_lock, flags); @@ -104,8 +106,8 @@ void rtl8192_hw_to_sleep(struct net_device *dev, u64 time) time - jiffies, msecs_to_jiffies(MIN_SLEEP_TIME)); return; } - - if ((time - jiffies) > msecs_to_jiffies(MAX_SLEEP_TIME)) { + timeout = jiffies + msecs_to_jiffies(MAX_SLEEP_TIME); + if (time_after((unsigned long)time, timeout)) { netdev_info(dev, "========>too long to sleep:%lld > %ld\n", time - jiffies, msecs_to_jiffies(MAX_SLEEP_TIME)); spin_unlock_irqrestore(&priv->ps_lock, flags);