wifi: iwlwifi: remove the version number from iwl_dts_measurement_notif_v2

No need to carry the version number in the structure name if this is the
latest version available.

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

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
index 34a1f97653c06c83f2e900a6ae746b90509e5d1a..4b450c722a9ce7cc380473ab226331c9e4050cc0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
@@ -502,7 +502,7 @@ enum iwl_legacy_cmds {
        /**
         * @DTS_MEASUREMENT_NOTIFICATION:
         * &struct iwl_dts_measurement_notif_v1 or
-        * &struct iwl_dts_measurement_notif_v2
+        * &struct iwl_dts_measurement_notif
         */
        DTS_MEASUREMENT_NOTIFICATION = 0xdd,
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h b/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h
index 1dce28f3afa033e78705437fc4c3e4ccedb0aedb..eb8961b51cb0139f352c20979db4a5d4002832ee 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h
@@ -55,7 +55,7 @@ enum iwl_phy_ops_subcmd_ids {
        /**
         * @DTS_MEASUREMENT_NOTIF_WIDE:
         * &struct iwl_dts_measurement_notif_v1 or
-        * &struct iwl_dts_measurement_notif_v2
+        * &struct iwl_dts_measurement_notif
         */
        DTS_MEASUREMENT_NOTIF_WIDE = 0xFF,
 };
@@ -152,13 +152,13 @@ struct iwl_dts_measurement_notif_v1 {
 } __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_NTFY_S_VER_1*/
 
 /**
- * struct iwl_dts_measurement_notif_v2 - measurements notification
+ * struct iwl_dts_measurement_notif - measurements notification
  *
  * @temp: the measured temperature
  * @voltage: the measured voltage
  * @threshold_idx: the trip index that was crossed
  */
-struct iwl_dts_measurement_notif_v2 {
+struct iwl_dts_measurement_notif {
        __le32 temp;
        __le32 voltage;
        __le32 threshold_idx;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
index 256f8f558b1540e856679fe190c285712b646b59..c851290e75a2404aefe0bfb08fe50a37c6562f0d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
@@ -105,7 +105,7 @@ static bool iwl_mvm_temp_notif_wait(struct iwl_notif_wait_data *notif_wait,
 void iwl_mvm_temp_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
 {
        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-       struct iwl_dts_measurement_notif_v2 *notif_v2;
+       struct iwl_dts_measurement_notif *notif_v2;
        int len = iwl_rx_packet_payload_len(pkt);
        int temp;
        u32 ths_crossed;