From: Johannes Berg <johannes.b...@intel.com>

There's no need to refer to system_wq directly, use the provided
wrapper schedule_delayed_work().

Made with the following spatch:
    @@
    expression E,F;
    @@
    -queue_delayed_work(system_wq, E, F);
    +schedule_delayed_work(E, F);

Signed-off-by: Johannes Berg <johannes.b...@intel.com>
Signed-off-by: Luca Coelho <luciano.coe...@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c   | 2 +-
 drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 6 +++---
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c     | 4 ++--
 drivers/net/wireless/intel/iwlwifi/mvm/tdls.c     | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c 
b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
index aac0426112c7..a8353ea1df58 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
@@ -927,7 +927,7 @@ int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,
        mvm->fw_dump_desc = desc;
        mvm->fw_dump_trig = trigger;
 
-       queue_delayed_work(system_wq, &mvm->fw_dump_wk, delay);
+       schedule_delayed_work(&mvm->fw_dump_wk, delay);
 
        return 0;
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c 
b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 0f1831b41915..d0806d27df58 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -1632,9 +1632,9 @@ void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,
 
        IWL_DEBUG_INFO(mvm, "Channel Switch Started Notification\n");
 
-       queue_delayed_work(system_wq, &mvm->cs_tx_unblock_dwork,
-                          msecs_to_jiffies(IWL_MVM_CS_UNBLOCK_TX_TIMEOUT *
-                                           csa_vif->bss_conf.beacon_int));
+       schedule_delayed_work(&mvm->cs_tx_unblock_dwork,
+                             msecs_to_jiffies(IWL_MVM_CS_UNBLOCK_TX_TIMEOUT *
+                                              csa_vif->bss_conf.beacon_int));
 
        ieee80211_csa_finish(csa_vif);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c 
b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 8d1b994ae79f..d48c2ecc0893 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1421,8 +1421,8 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct 
ieee80211_vif *vif,
        mvm->scan_vif = iwl_mvm_vif_from_mac80211(vif);
        iwl_mvm_ref(mvm, IWL_MVM_REF_SCAN);
 
-       queue_delayed_work(system_wq, &mvm->scan_timeout_dwork,
-                          msecs_to_jiffies(SCAN_TIMEOUT));
+       schedule_delayed_work(&mvm->scan_timeout_dwork,
+                             msecs_to_jiffies(SCAN_TIMEOUT));
 
        return 0;
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c 
b/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c
index df7cd87199ea..3d97436bbdf5 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c
@@ -551,8 +551,7 @@ void iwl_mvm_tdls_ch_switch_work(struct work_struct *work)
 
        /* retry after a DTIM if we failed sending now */
        delay = TU_TO_MS(vif->bss_conf.dtim_period * vif->bss_conf.beacon_int);
-       queue_delayed_work(system_wq, &mvm->tdls_cs.dwork,
-                          msecs_to_jiffies(delay));
+       schedule_delayed_work(&mvm->tdls_cs.dwork, msecs_to_jiffies(delay));
 out:
        mutex_unlock(&mvm->mutex);
 }
-- 
2.11.0

Reply via email to