Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26c7af7c authored Oct 01, 2012 by Johannes Berg

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>

parent f042c2eb

drivers/net/wireless/iwlwifi/dvm/main.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 &&
		@@ -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)

drivers/net/wireless/iwlwifi/pcie/trans.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}