diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-10-01 05:47:39 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-16 10:31:29 -0400 |
commit | 26c7af7cad587455f5335af02eb94af772992ace (patch) | |
tree | 5920fddc28fa6cc83fdd435b267f43c5f5d4cbbc | |
parent | f042c2eb96779944629fee99817718ede40d4970 (diff) |
iwlwifi: remove unused variables
Remove a number of variables that are assigned, but not used.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/trans.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index 963d02bd985..76262998efe 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c | |||
@@ -1191,8 +1191,6 @@ static void iwl_option_config(struct iwl_priv *priv) | |||
1191 | 1191 | ||
1192 | static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) | 1192 | static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) |
1193 | { | 1193 | { |
1194 | u16 radio_cfg; | ||
1195 | |||
1196 | priv->eeprom_data->sku = priv->eeprom_data->sku; | 1194 | priv->eeprom_data->sku = priv->eeprom_data->sku; |
1197 | 1195 | ||
1198 | if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE && | 1196 | if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE && |
@@ -1208,8 +1206,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) | |||
1208 | 1206 | ||
1209 | IWL_INFO(priv, "Device SKU: 0x%X\n", priv->eeprom_data->sku); | 1207 | IWL_INFO(priv, "Device SKU: 0x%X\n", priv->eeprom_data->sku); |
1210 | 1208 | ||
1211 | radio_cfg = priv->eeprom_data->radio_cfg; | ||
1212 | |||
1213 | priv->hw_params.tx_chains_num = | 1209 | priv->hw_params.tx_chains_num = |
1214 | num_of_ant(priv->eeprom_data->valid_tx_ant); | 1210 | num_of_ant(priv->eeprom_data->valid_tx_ant); |
1215 | if (priv->cfg->rx_with_siso_diversity) | 1211 | if (priv->cfg->rx_with_siso_diversity) |
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index 23490437def..6c383dff154 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c | |||
@@ -1516,14 +1516,13 @@ static void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn, | |||
1516 | struct iwl_tx_queue *txq = &trans_pcie->txq[txq_id]; | 1516 | struct iwl_tx_queue *txq = &trans_pcie->txq[txq_id]; |
1517 | /* n_bd is usually 256 => n_bd - 1 = 0xff */ | 1517 | /* n_bd is usually 256 => n_bd - 1 = 0xff */ |
1518 | int tfd_num = ssn & (txq->q.n_bd - 1); | 1518 | int tfd_num = ssn & (txq->q.n_bd - 1); |
1519 | int freed = 0; | ||
1520 | 1519 | ||
1521 | spin_lock(&txq->lock); | 1520 | spin_lock(&txq->lock); |
1522 | 1521 | ||
1523 | if (txq->q.read_ptr != tfd_num) { | 1522 | if (txq->q.read_ptr != tfd_num) { |
1524 | IWL_DEBUG_TX_REPLY(trans, "[Q %d] %d -> %d (%d)\n", | 1523 | IWL_DEBUG_TX_REPLY(trans, "[Q %d] %d -> %d (%d)\n", |
1525 | txq_id, txq->q.read_ptr, tfd_num, ssn); | 1524 | txq_id, txq->q.read_ptr, tfd_num, ssn); |
1526 | freed = iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs); | 1525 | iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs); |
1527 | if (iwl_queue_space(&txq->q) > txq->q.low_mark) | 1526 | if (iwl_queue_space(&txq->q) > txq->q.low_mark) |
1528 | iwl_wake_queue(trans, txq); | 1527 | iwl_wake_queue(trans, txq); |
1529 | } | 1528 | } |