iwlagn: temperature should be measure for all _agn devices

Thermal throttling functions are available for all _agn devices, call the
functions directly.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

7 files changed, 3 insertions, 47 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index e7844565ef55..946c7dca440a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -214,11 +214,6 @@ static struct iwl_lib_ops iwl1000_lib = {
         },
         .txfifo_flush = iwlagn_txfifo_flush,
         .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
-        .tt_ops = {
-                .lower_power_detection = iwl_tt_is_low_power_state,
-                .tt_power_mode = iwl_tt_current_power_mode,
-                .ct_kill_check = iwl_check_for_ct_kill,
-        }
 };
 
 static const struct iwl_ops iwl1000_ops = {
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index dcd660818d21..c8bb4a4930df 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -298,11 +298,6 @@ static struct iwl_lib_ops iwl2000_lib = {
         },
         .txfifo_flush = iwlagn_txfifo_flush,
         .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
-        .tt_ops = {
-                .lower_power_detection = iwl_tt_is_low_power_state,
-                .tt_power_mode = iwl_tt_current_power_mode,
-                .ct_kill_check = iwl_check_for_ct_kill,
-        }
 };
 
 static const struct iwl_ops iwl2000_ops = {
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 14b75f1de186..ced89f662bd1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -383,11 +383,6 @@ static struct iwl_lib_ops iwl5000_lib = {
         },
         .txfifo_flush = iwlagn_txfifo_flush,
         .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
-        .tt_ops = {
-                .lower_power_detection = iwl_tt_is_low_power_state,
-                .tt_power_mode = iwl_tt_current_power_mode,
-                .ct_kill_check = iwl_check_for_ct_kill,
-        }
 };
 
 static struct iwl_lib_ops iwl5150_lib = {
@@ -435,11 +430,6 @@ static struct iwl_lib_ops iwl5150_lib = {
         },
         .txfifo_flush = iwlagn_txfifo_flush,
         .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
-        .tt_ops = {
-                .lower_power_detection = iwl_tt_is_low_power_state,
-                .tt_power_mode = iwl_tt_current_power_mode,
-                .ct_kill_check = iwl_check_for_ct_kill,
-        }
 };
 
 static const struct iwl_ops iwl5000_ops = {
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 81881aad8751..ed6a0ed0f501 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -323,11 +323,6 @@ static struct iwl_lib_ops iwl6000_lib = {
         },
         .txfifo_flush = iwlagn_txfifo_flush,
         .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
-        .tt_ops = {
-                .lower_power_detection = iwl_tt_is_low_power_state,
-                .tt_power_mode = iwl_tt_current_power_mode,
-                .ct_kill_check = iwl_check_for_ct_kill,
-        }
 };
 
 static struct iwl_lib_ops iwl6030_lib = {
@@ -377,11 +372,6 @@ static struct iwl_lib_ops iwl6030_lib = {
         },
         .txfifo_flush = iwlagn_txfifo_flush,
         .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
-        .tt_ops = {
-                .lower_power_detection = iwl_tt_is_low_power_state,
-                .tt_power_mode = iwl_tt_current_power_mode,
-                .ct_kill_check = iwl_check_for_ct_kill,
-        }
 };
 
 static struct iwl_nic_ops iwl6050_nic_ops = {
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 2e8c936e556d..abee5074d30e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -139,12 +139,6 @@ struct iwl_temp_ops {
         void (*temperature)(struct iwl_priv *priv);
 };
 
-struct iwl_tt_ops {
-        bool (*lower_power_detection)(struct iwl_priv *priv);
-        u8 (*tt_power_mode)(struct iwl_priv *priv);
-        bool (*ct_kill_check)(struct iwl_priv *priv);
-};
-
 struct iwl_lib_ops {
         /* set hw dependent parameters */
         int (*set_hw_params)(struct iwl_priv *priv);
@@ -190,9 +184,6 @@ struct iwl_lib_ops {
         void (*dev_txfifo_flush)(struct iwl_priv *priv, u16 flush_control);
 
         struct iwl_debugfs_ops debugfs_ops;
-
-        /* thermal throttling */
-        struct iwl_tt_ops tt_ops;
 };
 
 struct iwl_led_ops {
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index b7cd95820ff8..595c930b28ae 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -357,12 +357,10 @@ static void iwl_power_build_cmd(struct iwl_priv *priv,
 
         if (priv->hw->conf.flags & IEEE80211_CONF_IDLE)
                 iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20);
-        else if (priv->cfg->ops->lib->tt_ops.lower_power_detection &&
-                 priv->cfg->ops->lib->tt_ops.tt_power_mode &&
-                 priv->cfg->ops->lib->tt_ops.lower_power_detection(priv)) {
+        else if (iwl_tt_is_low_power_state(priv)) {
                 /* in thermal throttling low power state */
                 iwl_static_sleep_cmd(priv, cmd,
-                    priv->cfg->ops->lib->tt_ops.tt_power_mode(priv), dtimper);
+                    iwl_tt_current_power_mode(priv), dtimper);
         } else if (!enabled)
                 iwl_power_sleep_cam_cmd(priv, cmd);
         else if (priv->power_data.debug_sleep_level_override >= 0)
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 1b69507db5fc..80c3565a66ae 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -484,10 +484,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
                 spin_unlock_irqrestore(&priv->hcmd_lock, flags);
 
                 IWL_ERR(priv, "No space in command queue\n");
-                if (priv->cfg->ops->lib->tt_ops.ct_kill_check) {
-                        is_ct_kill =
-                                priv->cfg->ops->lib->tt_ops.ct_kill_check(priv);
-                }
+                is_ct_kill = iwl_check_for_ct_kill(priv);
                 if (!is_ct_kill) {
                         IWL_ERR(priv, "Restarting adapter due to queue full\n");
                         iwlagn_fw_error(priv, false);