diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-06 16:30:42 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-07 13:51:49 -0500 |
commit | b1eea297d6b522b801c95b60b1e64fb61228c6c7 (patch) | |
tree | 20004f65acf9d342029900936fd04d67d90cb5ec /drivers/net/wireless/iwlwifi/iwl-testmode.c | |
parent | 2cc39c94c15ba1d5f6f71ab73f3369f9c17856ad (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-testmode.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-testmode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c index f26765b3a661..095d71dc99c4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-testmode.c +++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c | |||
@@ -975,7 +975,7 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) | |||
975 | return -ENOMSG; | 975 | return -ENOMSG; |
976 | } | 976 | } |
977 | /* in case multiple accesses to the device happens */ | 977 | /* in case multiple accesses to the device happens */ |
978 | mutex_lock(&priv->shrd->mutex); | 978 | mutex_lock(&priv->mutex); |
979 | 979 | ||
980 | switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) { | 980 | switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) { |
981 | case IWL_TM_CMD_APP2DEV_UCODE: | 981 | case IWL_TM_CMD_APP2DEV_UCODE: |
@@ -1027,7 +1027,7 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) | |||
1027 | break; | 1027 | break; |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | mutex_unlock(&priv->shrd->mutex); | 1030 | mutex_unlock(&priv->mutex); |
1031 | return result; | 1031 | return result; |
1032 | } | 1032 | } |
1033 | 1033 | ||
@@ -1062,7 +1062,7 @@ int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
1062 | } | 1062 | } |
1063 | 1063 | ||
1064 | /* in case multiple accesses to the device happens */ | 1064 | /* in case multiple accesses to the device happens */ |
1065 | mutex_lock(&priv->shrd->mutex); | 1065 | mutex_lock(&priv->mutex); |
1066 | switch (cmd) { | 1066 | switch (cmd) { |
1067 | case IWL_TM_CMD_APP2DEV_READ_TRACE: | 1067 | case IWL_TM_CMD_APP2DEV_READ_TRACE: |
1068 | IWL_DEBUG_INFO(priv, "uCode trace cmd to driver\n"); | 1068 | IWL_DEBUG_INFO(priv, "uCode trace cmd to driver\n"); |
@@ -1077,6 +1077,6 @@ int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
1077 | break; | 1077 | break; |
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | mutex_unlock(&priv->shrd->mutex); | 1080 | mutex_unlock(&priv->mutex); |
1081 | return result; | 1081 | return result; |
1082 | } | 1082 | } |