iwlwifi: dbg: make iwl_fw_dbg_no_trig_window trigger agnostic

As preparation for new trigger format, make the function
agnostic to the trigger fomat. Instead it gets the relevant
parameters - id and delay.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
index 0f09a2128ad277287406ac2aa9ad857b33dc2596..bee7a938a72195684645b794fc5914427b37586e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
@@ -154,12 +154,9 @@ iwl_fw_dbg_trigger_stop_conf_match(struct iwl_fw_runtime *fwrt,
 }
 
 static inline bool
-iwl_fw_dbg_no_trig_window(struct iwl_fw_runtime *fwrt,
-                         struct iwl_fw_dbg_trigger_tlv *trig)
+iwl_fw_dbg_no_trig_window(struct iwl_fw_runtime *fwrt, u32 id, u32 dis_ms)
 {
-       unsigned long wind_jiff =
-               msecs_to_jiffies(le16_to_cpu(trig->trig_dis_ms));
-       u32 id = le32_to_cpu(trig->id);
+       unsigned long wind_jiff = msecs_to_jiffies(dis_ms);
 
        /* If this is the first event checked, jump to update start ts */
        if (fwrt->dump.non_collect_ts_start[id] &&
@@ -179,7 +176,8 @@ iwl_fw_dbg_trigger_check_stop(struct iwl_fw_runtime *fwrt,
        if (wdev && !iwl_fw_dbg_trigger_vif_match(trig, wdev))
                return false;
 
-       if (iwl_fw_dbg_no_trig_window(fwrt, trig)) {
+       if (iwl_fw_dbg_no_trig_window(fwrt, le32_to_cpu(trig->id),
+                                     le16_to_cpu(trig->trig_dis_ms))) {
                IWL_WARN(fwrt, "Trigger %d occurred while no-collect window.\n",
                         trig->id);
                return false;