MSECS() in wifi.h is a plain alias for msecs_to_jiffies(). Call msecs_to_jiffies() at the 18 sites that used it and remove the macro. No functional change intended. Signed-off-by: Rishik Yechuri Assisted-by: Claude:claude-fable-5-1 --- drivers/net/wireless/realtek/rtlwifi/base.c | 2 +- drivers/net/wireless/realtek/rtlwifi/core.c | 2 +- drivers/net/wireless/realtek/rtlwifi/ps.c | 6 +++--- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 6 +++--- drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 6 +++--- drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 6 +++--- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 6 +++--- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index b6dcdd03535a..d0eda75f99d9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -2230,7 +2230,7 @@ void rtl_watch_dog_timer_callback(struct timer_list *t) &rtlpriv->works.watchdog_wq, 0); mod_timer(&rtlpriv->works.watchdog_timer, - jiffies + MSECS(RTL_WATCH_DOG_TIME)); + jiffies + msecs_to_jiffies(RTL_WATCH_DOG_TIME)); } static void rtl_fwevt_wq_callback(struct work_struct *work) diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c index e971132fee14..cc715b491ff7 100644 --- a/drivers/net/wireless/realtek/rtlwifi/core.c +++ b/drivers/net/wireless/realtek/rtlwifi/core.c @@ -615,7 +615,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, int radio_idx, u32 changed) if (!rtlpriv->psc.multi_buffered) queue_delayed_work(rtlpriv->works.rtl_wq, &rtlpriv->works.ps_work, - MSECS(5)); + msecs_to_jiffies(5)); } else { rtl_swlps_rf_awake(hw); rtlpriv->psc.sw_ps_enabled = false; diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c index bcab12c3b4c1..ba100c2cb525 100644 --- a/drivers/net/wireless/realtek/rtlwifi/ps.c +++ b/drivers/net/wireless/realtek/rtlwifi/ps.c @@ -254,7 +254,7 @@ void rtl_ips_nic_off(struct ieee80211_hw *hw) * this will cause link failed, so we delay 100ms here */ queue_delayed_work(rtlpriv->works.rtl_wq, - &rtlpriv->works.ips_nic_off_wq, MSECS(100)); + &rtlpriv->works.ips_nic_off_wq, msecs_to_jiffies(100)); } /* NOTICE: any opmode should exc nic_on, or disable without @@ -532,7 +532,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len) /* back to low-power land. and delay is * prevent null power save frame tx fail */ queue_delayed_work(rtlpriv->works.rtl_wq, - &rtlpriv->works.ps_work, MSECS(5)); + &rtlpriv->works.ps_work, msecs_to_jiffies(5)); } else { rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG, "u_bufferd: %x, m_buffered: %x\n", u_buffed, m_buffed); @@ -636,7 +636,7 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw) /* we tested that 40ms is enough for sw & hw sw delay */ queue_delayed_work(rtlpriv->works.rtl_wq, &rtlpriv->works.ps_rfon_wq, - MSECS(sleep_intv * mac->vif->bss_conf.beacon_int - 40)); + msecs_to_jiffies(sleep_intv * mac->vif->bss_conf.beacon_int - 40)); } void rtl_lps_change_work_callback(struct work_struct *work) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c index d9132d90feb1..f1a3a0c29b98 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c @@ -1677,7 +1677,7 @@ static void rtl88e_dm_fast_ant_training(struct ieee80211_hw *hw) rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 1); mod_timer(&rtlpriv->works.fast_antenna_training_timer, - jiffies + MSECS(RTL_WATCH_DOG_TIME)); + jiffies + msecs_to_jiffies(RTL_WATCH_DOG_TIME)); } } diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c index 0dbe92188bb1..bc89d9f2370a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c @@ -154,7 +154,7 @@ static void _rtl88ee_set_fw_clock_on(struct ieee80211_hw *hw, spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); if (schedule_timer) { mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); } } else { @@ -195,7 +195,7 @@ static void _rtl88ee_set_fw_clock_off(struct ieee80211_hw *hw, if (schedule_timer) { mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); return; } @@ -215,7 +215,7 @@ static void _rtl88ee_set_fw_clock_off(struct ieee80211_hw *hw, } else { spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); } } } diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c index 00048912900c..a8f88d53e97b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c @@ -130,7 +130,7 @@ static void _rtl92ee_set_fw_clock_on(struct ieee80211_hw *hw, spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); if (b_schedule_timer) { mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); } } else { spin_lock_bh(&rtlpriv->locks.fw_ps_lock); @@ -170,7 +170,7 @@ static void _rtl92ee_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val) if (b_schedule_timer) { mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); return; } @@ -189,7 +189,7 @@ static void _rtl92ee_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val) } else { spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); } } } diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c index bf7b5a32adaa..f93970fefb3b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c @@ -160,7 +160,7 @@ static void _rtl8723be_set_fw_clock_on(struct ieee80211_hw *hw, u8 rpwm_val, spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); if (b_schedule_timer) mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); } else { spin_lock_bh(&rtlpriv->locks.fw_ps_lock); rtlhal->fw_clk_change_in_progress = false; @@ -198,7 +198,7 @@ static void _rtl8723be_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val) if (b_schedule_timer) { mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); return; } @@ -217,7 +217,7 @@ static void _rtl8723be_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val) } else { spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); } } diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c index fb893ed8b802..14f2d35c9b62 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c @@ -157,7 +157,7 @@ static void _rtl8821ae_set_fw_clock_on(struct ieee80211_hw *hw, spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); if (b_schedule_timer) mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); } else { spin_lock_bh(&rtlpriv->locks.fw_ps_lock); rtlhal->fw_clk_change_in_progress = false; @@ -196,7 +196,7 @@ static void _rtl8821ae_set_fw_clock_off(struct ieee80211_hw *hw, if (b_schedule_timer) { mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); return; } @@ -216,7 +216,7 @@ static void _rtl8821ae_set_fw_clock_off(struct ieee80211_hw *hw, } else { spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); mod_timer(&rtlpriv->works.fw_clockoff_timer, - jiffies + MSECS(10)); + jiffies + msecs_to_jiffies(10)); } } } diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h index 347255b798c9..21a294b80c5b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -2823,7 +2823,6 @@ enum bt_radio_shared { #define packet_get_type(_packet) (EF1BYTE((_packet).octet[0]) & 0xFC) #define RTL_WATCH_DOG_TIME 2000 -#define MSECS(t) msecs_to_jiffies(t) #define WLAN_FC_GET_VERS(fc) (le16_to_cpu(fc) & IEEE80211_FCTL_VERS) #define WLAN_FC_GET_TYPE(fc) (le16_to_cpu(fc) & IEEE80211_FCTL_FTYPE) #define WLAN_FC_GET_STYPE(fc) (le16_to_cpu(fc) & IEEE80211_FCTL_STYPE) -- 2.43.0