tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net: pch_gbe: Use 'dma_free_coherent()' to undo 'dma_alloc_coherent()'

Memory allocation are done with 'dma_alloc_coherent()'. Be consistent
and use 'dma_free_coherent()' to free the corresponding memory.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20201121090330.1332543-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Christophe JAILLET and committed by
Jakub Kicinski 7fd6372e 8ff39301

+6 -4
+6 -4
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
··· 1816 1816 pch_gbe_clean_tx_ring(adapter, tx_ring); 1817 1817 vfree(tx_ring->buffer_info); 1818 1818 tx_ring->buffer_info = NULL; 1819 - pci_free_consistent(pdev, tx_ring->size, tx_ring->desc, tx_ring->dma); 1819 + dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc, 1820 + tx_ring->dma); 1820 1821 tx_ring->desc = NULL; 1821 1822 } 1822 1823 ··· 1834 1833 pch_gbe_clean_rx_ring(adapter, rx_ring); 1835 1834 vfree(rx_ring->buffer_info); 1836 1835 rx_ring->buffer_info = NULL; 1837 - pci_free_consistent(pdev, rx_ring->size, rx_ring->desc, rx_ring->dma); 1836 + dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc, 1837 + rx_ring->dma); 1838 1838 rx_ring->desc = NULL; 1839 1839 } 1840 1840 ··· 1956 1954 pch_gbe_clean_tx_ring(adapter, adapter->tx_ring); 1957 1955 pch_gbe_clean_rx_ring(adapter, adapter->rx_ring); 1958 1956 1959 - pci_free_consistent(adapter->pdev, rx_ring->rx_buff_pool_size, 1960 - rx_ring->rx_buff_pool, rx_ring->rx_buff_pool_logic); 1957 + dma_free_coherent(&adapter->pdev->dev, rx_ring->rx_buff_pool_size, 1958 + rx_ring->rx_buff_pool, rx_ring->rx_buff_pool_logic); 1961 1959 rx_ring->rx_buff_pool_logic = 0; 1962 1960 rx_ring->rx_buff_pool_size = 0; 1963 1961 rx_ring->rx_buff_pool = NULL;