aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2012-03-07 13:03:58 -0500
committerKalle Valo <kvalo@qca.qualcomm.com>2012-03-07 13:03:58 -0500
commitd0d670abcf97d2e1a369449847d776ebbfba292d (patch)
tree6a3f735adce798607af923b69d5e2d24ddd81695
parentddc3d77c80bbaae562a91d4e032b56b2e4570f90 (diff)
ath6kl: remove multiple assignments
Found by checkpatch: drivers/net/wireless/ath/ath6kl/cfg80211.c:1295: CHECK: multiple assignments should be avoided drivers/net/wireless/ath/ath6kl/cfg80211.c:3000: CHECK: multiple assignments should be avoided Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/cfg80211.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index e14d1a072cfe..9b87e6bf6c27 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -1285,7 +1285,6 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,
1285{ 1285{
1286 struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy); 1286 struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);
1287 struct ath6kl_vif *vif; 1287 struct ath6kl_vif *vif;
1288 u8 ath6kl_dbm;
1289 int dbm = MBM_TO_DBM(mbm); 1288 int dbm = MBM_TO_DBM(mbm);
1290 1289
1291 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type 0x%x, dbm %d\n", __func__, 1290 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type 0x%x, dbm %d\n", __func__,
@@ -1302,7 +1301,7 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,
1302 case NL80211_TX_POWER_AUTOMATIC: 1301 case NL80211_TX_POWER_AUTOMATIC:
1303 return 0; 1302 return 0;
1304 case NL80211_TX_POWER_LIMITED: 1303 case NL80211_TX_POWER_LIMITED:
1305 ar->tx_pwr = ath6kl_dbm = dbm; 1304 ar->tx_pwr = dbm;
1306 break; 1305 break;
1307 default: 1306 default:
1308 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type 0x%x not supported\n", 1307 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type 0x%x not supported\n",
@@ -1310,7 +1309,7 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,
1310 return -EOPNOTSUPP; 1309 return -EOPNOTSUPP;
1311 } 1310 }
1312 1311
1313 ath6kl_wmi_set_tx_pwr_cmd(ar->wmi, vif->fw_vif_idx, ath6kl_dbm); 1312 ath6kl_wmi_set_tx_pwr_cmd(ar->wmi, vif->fw_vif_idx, dbm);
1314 1313
1315 return 0; 1314 return 0;
1316} 1315}
@@ -3088,7 +3087,8 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,
3088 vif->wdev.netdev = ndev; 3087 vif->wdev.netdev = ndev;
3089 vif->wdev.iftype = type; 3088 vif->wdev.iftype = type;
3090 vif->fw_vif_idx = fw_vif_idx; 3089 vif->fw_vif_idx = fw_vif_idx;
3091 vif->nw_type = vif->next_mode = nw_type; 3090 vif->nw_type = nw_type;
3091 vif->next_mode = nw_type;
3092 vif->listen_intvl_t = ATH6KL_DEFAULT_LISTEN_INTVAL; 3092 vif->listen_intvl_t = ATH6KL_DEFAULT_LISTEN_INTVAL;
3093 vif->bmiss_time_t = ATH6KL_DEFAULT_BMISS_TIME; 3093 vif->bmiss_time_t = ATH6KL_DEFAULT_BMISS_TIME;
3094 3094