diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-04-18 10:28:17 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-18 10:29:43 -0400 |
commit | 68e8dfdadb424fd76ca81eeb399c3228adc5cea2 (patch) | |
tree | e8b641240ec3cdf61aa218d2c9d7e9c340683f69 /drivers/net/wireless/iwlwifi/iwl-agn-tt.c | |
parent | 9130bab137844d9ad3db6ab524de299cd2b9e39d (diff) |
iwlwifi: op_mode holds its pointer to the transport
Instead of using the shared area that we be killed.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-tt.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c index baaf5ba2fc38..18276db5b72d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c | |||
@@ -179,19 +179,19 @@ static void iwl_tt_check_exit_ct_kill(unsigned long data) | |||
179 | 179 | ||
180 | if (tt->state == IWL_TI_CT_KILL) { | 180 | if (tt->state == IWL_TI_CT_KILL) { |
181 | if (priv->thermal_throttle.ct_kill_toggle) { | 181 | if (priv->thermal_throttle.ct_kill_toggle) { |
182 | iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_CLR, | 182 | iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_CLR, |
183 | CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT); | 183 | CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT); |
184 | priv->thermal_throttle.ct_kill_toggle = false; | 184 | priv->thermal_throttle.ct_kill_toggle = false; |
185 | } else { | 185 | } else { |
186 | iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_SET, | 186 | iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_SET, |
187 | CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT); | 187 | CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT); |
188 | priv->thermal_throttle.ct_kill_toggle = true; | 188 | priv->thermal_throttle.ct_kill_toggle = true; |
189 | } | 189 | } |
190 | iwl_read32(trans(priv), CSR_UCODE_DRV_GP1); | 190 | iwl_read32(priv->trans, CSR_UCODE_DRV_GP1); |
191 | spin_lock_irqsave(&trans(priv)->reg_lock, flags); | 191 | spin_lock_irqsave(&priv->trans->reg_lock, flags); |
192 | if (likely(iwl_grab_nic_access(trans(priv)))) | 192 | if (likely(iwl_grab_nic_access(priv->trans))) |
193 | iwl_release_nic_access(trans(priv)); | 193 | iwl_release_nic_access(priv->trans); |
194 | spin_unlock_irqrestore(&trans(priv)->reg_lock, flags); | 194 | spin_unlock_irqrestore(&priv->trans->reg_lock, flags); |
195 | 195 | ||
196 | /* Reschedule the ct_kill timer to occur in | 196 | /* Reschedule the ct_kill timer to occur in |
197 | * CT_KILL_EXIT_DURATION seconds to ensure we get a | 197 | * CT_KILL_EXIT_DURATION seconds to ensure we get a |