iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: et131x: Match dma_alloc_ calls with dma_free_ calls

Browse Source 
Previous update was to replace pci_alloc with dma_alloc calls. I missed
replacing the corresponding pci_free_ calls with the dma versions. Now
done. Thanks to Denis Kirjanov <kirjanov@gmail.com> for pointing this
out.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark Einon 2011-10-20 01:18:44 +01:00 committed by Greg Kroah-Hartman
parent 0d1b7a84d3
commit 675c8f68ca
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/et131x/et131x.c
View File

@ -2238,7 +2238,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
(rx_ring->fbr[0]->buffsize * FBR_CHUNKS) + (rx_ring->fbr[0]->buffsize * FBR_CHUNKS) +
fbr1_align - 1; fbr1_align - 1;
pci_free_consistent(adapter->pdev, dma_free_coherent(&adapter->pdev->dev,
bufsize, bufsize,
rx_ring->fbr[0]->mem_virtaddrs[index], rx_ring->fbr[0]->mem_virtaddrs[index],
rx_ring->fbr[0]->mem_physaddrs[index]); rx_ring->fbr[0]->mem_physaddrs[index]);
@ -2254,7 +2254,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[0]->num_entries) bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[0]->num_entries)
+ 0xfff; + 0xfff;
pci_free_consistent(adapter->pdev, bufsize, dma_free_coherent(&adapter->pdev->dev, bufsize,
rx_ring->fbr[0]->ring_virtaddr, rx_ring->fbr[0]->ring_virtaddr,
rx_ring->fbr[0]->ring_physaddr); rx_ring->fbr[0]->ring_physaddr);
@ -2272,7 +2272,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
(rx_ring->fbr[1]->buffsize * (rx_ring->fbr[1]->buffsize *
(FBR_CHUNKS + 1)) - 1; (FBR_CHUNKS + 1)) - 1;
pci_free_consistent(adapter->pdev, dma_free_coherent(&adapter->pdev->dev,
bufsize, bufsize,
rx_ring->fbr[1]->mem_virtaddrs[index], rx_ring->fbr[1]->mem_virtaddrs[index],
rx_ring->fbr[1]->mem_physaddrs[index]); rx_ring->fbr[1]->mem_physaddrs[index]);
@ -2288,7 +2288,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[1]->num_entries) bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[1]->num_entries)
+ 0xfff; + 0xfff;
pci_free_consistent(adapter->pdev, dma_free_coherent(&adapter->pdev->dev,
bufsize, bufsize,
rx_ring->fbr[1]->ring_virtaddr, rx_ring->fbr[1]->ring_virtaddr,
rx_ring->fbr[1]->ring_physaddr); rx_ring->fbr[1]->ring_physaddr);
@ -2303,7 +2303,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
sizeof(struct pkt_stat_desc) * sizeof(struct pkt_stat_desc) *
adapter->rx_ring.psr_num_entries; adapter->rx_ring.psr_num_entries;
pci_free_consistent(adapter->pdev, pktstat_ringsize, dma_free_coherent(&adapter->pdev->dev, pktstat_ringsize,
rx_ring->ps_ring_virtaddr, rx_ring->ps_ring_virtaddr,
rx_ring->ps_ring_physaddr); rx_ring->ps_ring_physaddr);
@ -2312,7 +2312,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
/* Free area of memory for the writeback of status information */ /* Free area of memory for the writeback of status information */
if (rx_ring->rx_status_block) { if (rx_ring->rx_status_block) {
pci_free_consistent(adapter->pdev, dma_free_coherent(&adapter->pdev->dev,
sizeof(struct rx_status_block), sizeof(struct rx_status_block),
rx_ring->rx_status_block, rx_ring->rx_status_bus); rx_ring->rx_status_block, rx_ring->rx_status_bus);
rx_ring->rx_status_block = NULL; rx_ring->rx_status_block = NULL;
@ -3038,7 +3038,7 @@ void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)
/* Free memory relating to Tx rings here */ /* Free memory relating to Tx rings here */
desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX) desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX)
+ 4096 - 1; + 4096 - 1;
pci_free_consistent(adapter->pdev, dma_free_coherent(&adapter->pdev->dev,
desc_size, desc_size,
adapter->tx_ring.tx_desc_ring, adapter->tx_ring.tx_desc_ring,
adapter->tx_ring.tx_desc_ring_pa); adapter->tx_ring.tx_desc_ring_pa);
@ -3047,7 +3047,7 @@ void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)
/* Free memory for the Tx status block */ /* Free memory for the Tx status block */
if (adapter->tx_ring.tx_status) { if (adapter->tx_ring.tx_status) {
pci_free_consistent(adapter->pdev, dma_free_coherent(&adapter->pdev->dev,
sizeof(u32), sizeof(u32),
adapter->tx_ring.tx_status, adapter->tx_ring.tx_status,
adapter->tx_ring.tx_status_pa); adapter->tx_ring.tx_status_pa);