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

Commit 2e724443 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by John W. Linville
Browse files

iwlwifi: use the DMA state API instead of the pci equivalents 

This can be cleanly applied to wireless-2.6 and iwlwifi git trees.

=
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Subject: [PATCH] iwlwifi: use the DMA state API instead of the pci equivalents

This replace the PCI DMA state API (include/linux/pci-dma.h) with the
DMA equivalents since the PCI DMA state API will be obsolete.

No functional change.

For further information about the background:

http://marc.info/?l=linux-netdev&m=127037540020276&w=2



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9e55ba7b

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

+2 −2
Original line number Diff line number Diff line
@@ -850,8 +850,8 @@ void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) 
	/* Unmap tx_cmd */

	if (counter)

		pci_unmap_single(dev,

				pci_unmap_addr(&txq->meta[index], mapping),

				pci_unmap_len(&txq->meta[index], len),

				dma_unmap_addr(&txq->meta[index], mapping),

				dma_unmap_len(&txq->meta[index], len),

				PCI_DMA_TODEVICE);



	/* unmap chunks if any */

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

+2 −2
Original line number Diff line number Diff line
@@ -704,8 +704,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	txcmd_phys = pci_map_single(priv->pci_dev,

				    &out_cmd->hdr, len,

				    PCI_DMA_BIDIRECTIONAL);

	pci_unmap_addr_set(out_meta, mapping, txcmd_phys);

	pci_unmap_len_set(out_meta, len, len);

	dma_unmap_addr_set(out_meta, mapping, txcmd_phys);

	dma_unmap_len_set(out_meta, len, len);

	/* Add buffer containing Tx command and MAC(!) header to TFD's

	 * first entry */

	priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,

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

+2 −2
Original line number Diff line number Diff line
@@ -474,8 +474,8 @@ void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) 
	/* Unmap tx_cmd */

	if (num_tbs)

		pci_unmap_single(dev,

				pci_unmap_addr(&txq->meta[index], mapping),

				pci_unmap_len(&txq->meta[index], len),

				dma_unmap_addr(&txq->meta[index], mapping),

				dma_unmap_len(&txq->meta[index], len),

				PCI_DMA_BIDIRECTIONAL);



	/* Unmap chunks, if any. */

drivers/net/wireless/iwlwifi/iwl-dev.h

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ struct iwl_cmd_meta { 
	 * structure is stored at the end of the shared queue memory. */

	u32 flags;



	DECLARE_PCI_UNMAP_ADDR(mapping)

	DECLARE_PCI_UNMAP_LEN(len)

	DEFINE_DMA_UNMAP_ADDR(mapping);

	DEFINE_DMA_UNMAP_LEN(len);

};



/*

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

+8 −8
Original line number Diff line number Diff line
@@ -154,15 +154,15 @@ void iwl_cmd_queue_free(struct iwl_priv *priv) 
		}



		pci_unmap_single(priv->pci_dev,

				 pci_unmap_addr(&txq->meta[i], mapping),

				 pci_unmap_len(&txq->meta[i], len),

				 dma_unmap_addr(&txq->meta[i], mapping),

				 dma_unmap_len(&txq->meta[i], len),

				 PCI_DMA_BIDIRECTIONAL);

	}

	if (huge) {

		i = q->n_window;

		pci_unmap_single(priv->pci_dev,

				 pci_unmap_addr(&txq->meta[i], mapping),

				 pci_unmap_len(&txq->meta[i], len),

				 dma_unmap_addr(&txq->meta[i], mapping),

				 dma_unmap_len(&txq->meta[i], len),

				 PCI_DMA_BIDIRECTIONAL);

	}
@@ -516,8 +516,8 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 


	phys_addr = pci_map_single(priv->pci_dev, &out_cmd->hdr,

				   fix_size, PCI_DMA_BIDIRECTIONAL);

	pci_unmap_addr_set(out_meta, mapping, phys_addr);

	pci_unmap_len_set(out_meta, len, fix_size);

	dma_unmap_addr_set(out_meta, mapping, phys_addr);

	dma_unmap_len_set(out_meta, len, fix_size);



	trace_iwlwifi_dev_hcmd(priv, &out_cmd->hdr, fix_size, cmd->flags);
@@ -611,8 +611,8 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) 
	meta = &txq->meta[cmd_index];



	pci_unmap_single(priv->pci_dev,

			 pci_unmap_addr(meta, mapping),

			 pci_unmap_len(meta, len),

			 dma_unmap_addr(meta, mapping),

			 dma_unmap_len(meta, len),

			 PCI_DMA_BIDIRECTIONAL);



	/* Input error checking is done when commands are added to queue. */