Skip to content

Commit

Permalink
iwlwifi: remove unused variables
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg committed Oct 16, 2012
1 parent f042c2e commit 26c7af7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
4 changes: 0 additions & 4 deletions drivers/net/wireless/iwlwifi/dvm/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1191,8 +1191,6 @@ static void iwl_option_config(struct iwl_priv *priv)

static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
{
u16 radio_cfg;

priv->eeprom_data->sku = priv->eeprom_data->sku;

if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE &&
Expand All @@ -1208,8 +1206,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)

IWL_INFO(priv, "Device SKU: 0x%X\n", priv->eeprom_data->sku);

radio_cfg = priv->eeprom_data->radio_cfg;

priv->hw_params.tx_chains_num =
num_of_ant(priv->eeprom_data->valid_tx_ant);
if (priv->cfg->rx_with_siso_diversity)
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/wireless/iwlwifi/pcie/trans.c
Original file line number Diff line number Diff line change
Expand Up @@ -1516,14 +1516,13 @@ static void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
struct iwl_tx_queue *txq = &trans_pcie->txq[txq_id];
/* n_bd is usually 256 => n_bd - 1 = 0xff */
int tfd_num = ssn & (txq->q.n_bd - 1);
int freed = 0;

spin_lock(&txq->lock);

if (txq->q.read_ptr != tfd_num) {
IWL_DEBUG_TX_REPLY(trans, "[Q %d] %d -> %d (%d)\n",
txq_id, txq->q.read_ptr, tfd_num, ssn);
freed = iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs);
iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs);
if (iwl_queue_space(&txq->q) > txq->q.low_mark)
iwl_wake_queue(trans, txq);
}
Expand Down

0 comments on commit 26c7af7

Please sign in to comment.