iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device

The fw_trips_index[] array in struct iwl_mvm_thermal_device is only
populated, but never read, so drop it.

Note that the iwl_mvm_send_temp_report_ths_cmd() code populating
fw_trips_index[] is questionable, because it accesses a trips table
of a thermal zone directly, which is not guaranteed to work in the
future.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Miri Korenblit <Miriam.rachel.korenblit@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 40627961b834a2ee860445b4557cf19498f4e166..a618824f0b658ed2b025ad84033f837ccbfa0dd2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -539,12 +539,10 @@ struct iwl_mvm_tt_mgmt {
 /**
  *struct iwl_mvm_thermal_device - thermal zone related data
  * @temp_trips: temperature thresholds for report
- * @fw_trips_index: keep indexes to original array - temp_trips
  * @tzone: thermal zone device data
 */
 struct iwl_mvm_thermal_device {
        struct thermal_trip trips[IWL_MAX_DTS_TRIPS];
-       u8 fw_trips_index[IWL_MAX_DTS_TRIPS];
        struct thermal_zone_device *tzone;
 };
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
index dee9c367dcd3576a47b0a7d2b8b69cc2d1cc6651..a2f921a1f5bd6d001a8d0d4fa49597dfcadc0f13 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
@@ -562,7 +562,7 @@ int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm)
        struct temp_report_ths_cmd cmd = {0};
        int ret;
 #ifdef CONFIG_THERMAL
-       int i, j, idx = 0;
+       int i, idx = 0;
 
        lockdep_assert_held(&mvm->mutex);
 
@@ -588,17 +588,6 @@ int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm)
        /*sort cmd array*/
        sort(cmd.thresholds, idx, sizeof(s16), compare_temps, NULL);
 
-       /* we should save the indexes of trips because we sort
-        * and compress the orginal array
-        */
-       for (i = 0; i < idx; i++) {
-               for (j = 0; j < IWL_MAX_DTS_TRIPS; j++) {
-                       if ((int)(le16_to_cpu(cmd.thresholds[i]) * 1000) ==
-                           mvm->tz_device.trips[j].temperature)
-                               mvm->tz_device.fw_trips_index[i] = j;
-               }
-       }
-
 send:
 #endif
        ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(PHY_OPS_GROUP,