aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2011-10-19 20:18:44 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-23 04:07:11 -0400
commit675c8f68ca65632624c0ebc03788f53c2109bf5b (patch)
treeff34852a00d2b177537fb26ad020caf6d9cc887c /drivers/staging/et131x
parent0d1b7a84d3672023c6bc6d7eaa988db8bd3202ba (diff)
staging: et131x: Match dma_alloc_ calls with dma_free_ calls
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>
Diffstat (limited to 'drivers/staging/et131x')
-rw-r--r--drivers/staging/et131x/et131x.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 06ba4a95955..28d54b31e43 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -2238,7 +2238,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
2238 (rx_ring->fbr[0]->buffsize * FBR_CHUNKS) + 2238 (rx_ring->fbr[0]->buffsize * FBR_CHUNKS) +
2239 fbr1_align - 1; 2239 fbr1_align - 1;
2240 2240
2241 pci_free_consistent(adapter->pdev, 2241 dma_free_coherent(&adapter->pdev->dev,
2242 bufsize, 2242 bufsize,
2243 rx_ring->fbr[0]->mem_virtaddrs[index], 2243 rx_ring->fbr[0]->mem_virtaddrs[index],
2244 rx_ring->fbr[0]->mem_physaddrs[index]); 2244 rx_ring->fbr[0]->mem_physaddrs[index]);
@@ -2254,7 +2254,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
2254 bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[0]->num_entries) 2254 bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[0]->num_entries)
2255 + 0xfff; 2255 + 0xfff;
2256 2256
2257 pci_free_consistent(adapter->pdev, bufsize, 2257 dma_free_coherent(&adapter->pdev->dev, bufsize,
2258 rx_ring->fbr[0]->ring_virtaddr, 2258 rx_ring->fbr[0]->ring_virtaddr,
2259 rx_ring->fbr[0]->ring_physaddr); 2259 rx_ring->fbr[0]->ring_physaddr);
2260 2260
@@ -2272,7 +2272,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
2272 (rx_ring->fbr[1]->buffsize * 2272 (rx_ring->fbr[1]->buffsize *
2273 (FBR_CHUNKS + 1)) - 1; 2273 (FBR_CHUNKS + 1)) - 1;
2274 2274
2275 pci_free_consistent(adapter->pdev, 2275 dma_free_coherent(&adapter->pdev->dev,
2276 bufsize, 2276 bufsize,
2277 rx_ring->fbr[1]->mem_virtaddrs[index], 2277 rx_ring->fbr[1]->mem_virtaddrs[index],
2278 rx_ring->fbr[1]->mem_physaddrs[index]); 2278 rx_ring->fbr[1]->mem_physaddrs[index]);
@@ -2288,7 +2288,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
2288 bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[1]->num_entries) 2288 bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[1]->num_entries)
2289 + 0xfff; 2289 + 0xfff;
2290 2290
2291 pci_free_consistent(adapter->pdev, 2291 dma_free_coherent(&adapter->pdev->dev,
2292 bufsize, 2292 bufsize,
2293 rx_ring->fbr[1]->ring_virtaddr, 2293 rx_ring->fbr[1]->ring_virtaddr,
2294 rx_ring->fbr[1]->ring_physaddr); 2294 rx_ring->fbr[1]->ring_physaddr);
@@ -2303,7 +2303,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
2303 sizeof(struct pkt_stat_desc) * 2303 sizeof(struct pkt_stat_desc) *
2304 adapter->rx_ring.psr_num_entries; 2304 adapter->rx_ring.psr_num_entries;
2305 2305
2306 pci_free_consistent(adapter->pdev, pktstat_ringsize, 2306 dma_free_coherent(&adapter->pdev->dev, pktstat_ringsize,
2307 rx_ring->ps_ring_virtaddr, 2307 rx_ring->ps_ring_virtaddr,
2308 rx_ring->ps_ring_physaddr); 2308 rx_ring->ps_ring_physaddr);
2309 2309
@@ -2312,7 +2312,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
2312 2312
2313 /* Free area of memory for the writeback of status information */ 2313 /* Free area of memory for the writeback of status information */
2314 if (rx_ring->rx_status_block) { 2314 if (rx_ring->rx_status_block) {
2315 pci_free_consistent(adapter->pdev, 2315 dma_free_coherent(&adapter->pdev->dev,
2316 sizeof(struct rx_status_block), 2316 sizeof(struct rx_status_block),
2317 rx_ring->rx_status_block, rx_ring->rx_status_bus); 2317 rx_ring->rx_status_block, rx_ring->rx_status_bus);
2318 rx_ring->rx_status_block = NULL; 2318 rx_ring->rx_status_block = NULL;
@@ -3038,7 +3038,7 @@ void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)
3038 /* Free memory relating to Tx rings here */ 3038 /* Free memory relating to Tx rings here */
3039 desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX) 3039 desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX)
3040 + 4096 - 1; 3040 + 4096 - 1;
3041 pci_free_consistent(adapter->pdev, 3041 dma_free_coherent(&adapter->pdev->dev,
3042 desc_size, 3042 desc_size,
3043 adapter->tx_ring.tx_desc_ring, 3043 adapter->tx_ring.tx_desc_ring,
3044 adapter->tx_ring.tx_desc_ring_pa); 3044 adapter->tx_ring.tx_desc_ring_pa);
@@ -3047,7 +3047,7 @@ void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)
3047 3047
3048 /* Free memory for the Tx status block */ 3048 /* Free memory for the Tx status block */
3049 if (adapter->tx_ring.tx_status) { 3049 if (adapter->tx_ring.tx_status) {
3050 pci_free_consistent(adapter->pdev, 3050 dma_free_coherent(&adapter->pdev->dev,
3051 sizeof(u32), 3051 sizeof(u32),
3052 adapter->tx_ring.tx_status, 3052 adapter->tx_ring.tx_status,
3053 adapter->tx_ring.tx_status_pa); 3053 adapter->tx_ring.tx_status_pa);