]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: rtl8192u: ieee80211: ieee80211_softmac: Replace MSECS with msecs_to_jiffies
authorAmitoj Kaur Chawla <amitoj1606@gmail.com>
Sat, 13 Feb 2016 04:34:04 +0000 (10:04 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Feb 2016 00:38:11 +0000 (16:38 -0800)
Replace driver specific macro MSECS with msecs_to_jiffies().

This was found using the following Coccinelle semantic patch:

//<smpl>
@@
expression e;
@@

- MSECS(e)
+ msecs_to_jiffies(e)
//</smpl>

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c

index 21ee41034d7aef5c0f743d924ae56f5e1b39591d..6d85648c6d7c42024ea87eb81663f2cc156d1627 100644 (file)
@@ -380,7 +380,8 @@ static void ieee80211_send_beacon(struct ieee80211_device *ieee)
        if (ieee->beacon_txing && ieee->ieee_up) {
 //             if(!timer_pending(&ieee->beacon_timer))
 //                     add_timer(&ieee->beacon_timer);
-               mod_timer(&ieee->beacon_timer,jiffies+(MSECS(ieee->current_network.beacon_interval-5)));
+               mod_timer(&ieee->beacon_timer,
+                         jiffies + msecs_to_jiffies(ieee->current_network.beacon_interval-5));
        }
        //spin_unlock_irqrestore(&ieee->beacon_lock,flags);
 }
@@ -1735,10 +1736,12 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h,
        if(dtim & ((IEEE80211_DTIM_UCAST | IEEE80211_DTIM_MBCAST)& ieee->ps))
                return 2;
 
-       if(!time_after(jiffies, ieee->dev->trans_start + MSECS(timeout)))
+       if(!time_after(jiffies,
+                      ieee->dev->trans_start + msecs_to_jiffies(timeout)))
                return 0;
 
-       if(!time_after(jiffies, ieee->last_rx_ps_time + MSECS(timeout)))
+       if(!time_after(jiffies,
+                      ieee->last_rx_ps_time + msecs_to_jiffies(timeout)))
                return 0;
 
        if((ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE ) &&