diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 548dac2f6a96..581c683a8507 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
@@ -384,10 +384,10 @@ EXPORT_SYMBOL(iwl_ht_enabled); | |||
384 | 384 | ||
385 | bool iwl_within_ct_kill_margin(struct iwl_priv *priv) | 385 | bool iwl_within_ct_kill_margin(struct iwl_priv *priv) |
386 | { | 386 | { |
387 | s32 temp = priv->temperature; /* degrees CELSIUS except 4965 */ | 387 | s32 temp = priv->temperature; /* degrees CELSIUS except specified */ |
388 | bool within_margin = false; | 388 | bool within_margin = false; |
389 | 389 | ||
390 | if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_4965) | 390 | if (priv->cfg->temperature_kelvin) |
391 | temp = KELVIN_TO_CELSIUS(priv->temperature); | 391 | temp = KELVIN_TO_CELSIUS(priv->temperature); |
392 | 392 | ||
393 | if (!priv->thermal_throttle.advanced_tt) | 393 | if (!priv->thermal_throttle.advanced_tt) |
@@ -840,12 +840,12 @@ EXPORT_SYMBOL(iwl_tt_exit_ct_kill); | |||
840 | static void iwl_bg_tt_work(struct work_struct *work) | 840 | static void iwl_bg_tt_work(struct work_struct *work) |
841 | { | 841 | { |
842 | struct iwl_priv *priv = container_of(work, struct iwl_priv, tt_work); | 842 | struct iwl_priv *priv = container_of(work, struct iwl_priv, tt_work); |
843 | s32 temp = priv->temperature; /* degrees CELSIUS except 4965 */ | 843 | s32 temp = priv->temperature; /* degrees CELSIUS except specified */ |
844 | 844 | ||
845 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) | 845 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) |
846 | return; | 846 | return; |
847 | 847 | ||
848 | if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_4965) | 848 | if (priv->cfg->temperature_kelvin) |
849 | temp = KELVIN_TO_CELSIUS(priv->temperature); | 849 | temp = KELVIN_TO_CELSIUS(priv->temperature); |
850 | 850 | ||
851 | if (!priv->thermal_throttle.advanced_tt) | 851 | if (!priv->thermal_throttle.advanced_tt) |
@@ -875,7 +875,7 @@ void iwl_tt_initialize(struct iwl_priv *priv) | |||
875 | int size = sizeof(struct iwl_tt_trans) * (IWL_TI_STATE_MAX - 1); | 875 | int size = sizeof(struct iwl_tt_trans) * (IWL_TI_STATE_MAX - 1); |
876 | struct iwl_tt_trans *transaction; | 876 | struct iwl_tt_trans *transaction; |
877 | 877 | ||
878 | IWL_DEBUG_POWER(priv, "Initialize Thermal Throttling \n"); | 878 | IWL_DEBUG_POWER(priv, "Initialize Thermal Throttling\n"); |
879 | 879 | ||
880 | memset(tt, 0, sizeof(struct iwl_tt_mgmt)); | 880 | memset(tt, 0, sizeof(struct iwl_tt_mgmt)); |
881 | 881 | ||