wifi: iwlwifi: pcie: remove constant wdg_timeout

This value is only ever initialized and read, so just
replace the usage with the constant and remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250503224232.48333e80a74d.I6c1aaa23fac5ff7400aa59a3093b53774261cb0e@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index 360367bf6988c065b61474a18d72a17315390de0..f08978d4402e8b58e57bf115c62c58f3bb905b99 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -304,7 +304,6 @@ enum iwl_pcie_imr_status {
  * @cmd: command queue data
  * @cmd.fifo: FIFO number
  * @cmd.q_id: queue ID
- * @cmd.wdg_timeout: watchdog timeout
  * @tfd: TFD data
  * @tfd.max_tbs: max number of buffers per TFD
  * @tfd.size: TFD size
@@ -324,7 +323,6 @@ struct iwl_pcie_txqs {
        struct {
                u8 fifo;
                u8 q_id;
-               unsigned int wdg_timeout;
        } cmd;
 
        struct {

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index de2c320a0e39c587235a80ca13cac22b720d8368..9423d177cd5b962bcb5284400154a894d6f54fa5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3844,9 +3844,6 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
        }
        trans->max_skb_frags = IWL_TRANS_PCIE_MAX_FRAGS(trans_pcie);
 
-       /* Set a short watchdog for the command queue */
-       trans_pcie->txqs.cmd.wdg_timeout = IWL_DEF_WD_TIMEOUT;
-
        trans_pcie->txqs.tso_hdr_page = alloc_percpu(struct iwl_tso_hdr_page);
        if (!trans_pcie->txqs.tso_hdr_page) {
                ret = -ENOMEM;

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
index 7d7a217b157521895de9e7567ce6b96b0f8368f4..6c2477eec97dd54d54193a77436d3eef95422ff4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -514,7 +514,7 @@ void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr)
 
        iwl_trans_ac_txq_enable(trans, trans_pcie->txqs.cmd.q_id,
                                trans_pcie->txqs.cmd.fifo,
-                               trans_pcie->txqs.cmd.wdg_timeout);
+                               IWL_DEF_WD_TIMEOUT);
 
        /* Activate all Tx DMA/FIFO channels */
        iwl_scd_activate_fifos(trans);