Commit 3978e5bc authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwlwifi: iwl_tx_queue_alloc : fix warning in printk formatting 



This patch fix compilation warning in printk formatting
iwl_tx_queue_alloc function.
Cleanup the code a bit on the way.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c771c9d8

drivers/net/wireless/iwlwifi/iwl-tx.c

+5 −6
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv, 
			      struct iwl_tx_queue *txq, u32 id)

{

	struct pci_dev *dev = priv->pci_dev;

	size_t tfd_sz = priv->hw_params.tfd_size * TFD_QUEUE_SIZE_MAX;



	/* Driver private data, only for Tx (not command) queues,

	 * not shared with device. */
@@ -289,18 +290,16 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv, 
				  "structures failed\n");

			goto error;

		}

	} else

	} else {

		txq->txb = NULL;

	}



	/* Circular buffer of transmit frame descriptors (TFDs),

	 * shared with device */

	txq->tfds = pci_alloc_consistent(dev,

			priv->hw_params.tfd_size * TFD_QUEUE_SIZE_MAX,

			&txq->q.dma_addr);

	txq->tfds = pci_alloc_consistent(dev, tfd_sz, &txq->q.dma_addr);



	if (!txq->tfds) {

		IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n",

			  priv->hw_params.tfd_size * TFD_QUEUE_SIZE_MAX);

		IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n", tfd_sz);

		goto error;

	}

	txq->q.id = id;

CRA Git | Maintained and supported by SUSTech CRA and CCSE