aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-06 16:30:42 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-07 13:51:49 -0500
commitb1eea297d6b522b801c95b60b1e64fb61228c6c7 (patch)
tree20004f65acf9d342029900936fd04d67d90cb5ec /drivers/net/wireless/iwlwifi/iwl-agn-tt.c
parent2cc39c94c15ba1d5f6f71ab73f3369f9c17856ad (diff)
iwlwifi: move mutex out of shared
Now the mutex no longer needs to be shared, so move it into iwl_priv. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-tt.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-tt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
index 56d7c0e38163..85fe590ee721 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
@@ -310,7 +310,7 @@ static void iwl_legacy_tt_handler(struct iwl_priv *priv, s32 temp, bool force)
310 tt->tt_power_mode = IWL_POWER_INDEX_5; 310 tt->tt_power_mode = IWL_POWER_INDEX_5;
311 break; 311 break;
312 } 312 }
313 mutex_lock(&priv->shrd->mutex); 313 mutex_lock(&priv->mutex);
314 if (old_state == IWL_TI_CT_KILL) 314 if (old_state == IWL_TI_CT_KILL)
315 clear_bit(STATUS_CT_KILL, &priv->shrd->status); 315 clear_bit(STATUS_CT_KILL, &priv->shrd->status);
316 if (tt->state != IWL_TI_CT_KILL && 316 if (tt->state != IWL_TI_CT_KILL &&
@@ -341,7 +341,7 @@ static void iwl_legacy_tt_handler(struct iwl_priv *priv, s32 temp, bool force)
341 IWL_DEBUG_TEMP(priv, "Power Index change to %u\n", 341 IWL_DEBUG_TEMP(priv, "Power Index change to %u\n",
342 tt->tt_power_mode); 342 tt->tt_power_mode);
343 } 343 }
344 mutex_unlock(&priv->shrd->mutex); 344 mutex_unlock(&priv->mutex);
345 } 345 }
346} 346}
347 347
@@ -451,7 +451,7 @@ static void iwl_advance_tt_handler(struct iwl_priv *priv, s32 temp, bool force)
451 * in case get disabled before */ 451 * in case get disabled before */
452 iwl_set_rxon_ht(priv, &priv->current_ht_config); 452 iwl_set_rxon_ht(priv, &priv->current_ht_config);
453 } 453 }
454 mutex_lock(&priv->shrd->mutex); 454 mutex_lock(&priv->mutex);
455 if (old_state == IWL_TI_CT_KILL) 455 if (old_state == IWL_TI_CT_KILL)
456 clear_bit(STATUS_CT_KILL, &priv->shrd->status); 456 clear_bit(STATUS_CT_KILL, &priv->shrd->status);
457 if (tt->state != IWL_TI_CT_KILL && 457 if (tt->state != IWL_TI_CT_KILL &&
@@ -486,7 +486,7 @@ static void iwl_advance_tt_handler(struct iwl_priv *priv, s32 temp, bool force)
486 iwl_perform_ct_kill_task(priv, false); 486 iwl_perform_ct_kill_task(priv, false);
487 } 487 }
488 } 488 }
489 mutex_unlock(&priv->shrd->mutex); 489 mutex_unlock(&priv->mutex);
490 } 490 }
491} 491}
492 492