diff options
| author | Luis Chamberlain <mcgrof@kernel.org> | 2019-01-04 03:23:09 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-01-08 07:58:37 -0500 |
| commit | 750afb08ca71310fcf0c4e2cb1565c63b8235b60 (patch) | |
| tree | 1dde3877eb4a1a0f0349786b66c3d9276ae94561 /drivers/net/ethernet/intel/i40e/i40e_main.c | |
| parent | 3bd6e94bec122a951d462c239b47954cf5f36e33 (diff) | |
cross-tree: phase out dma_zalloc_coherent()
We already need to zero out memory for dma_alloc_coherent(), as such
using dma_zalloc_coherent() is superflous. Phase it out.
This change was generated with the following Coccinelle SmPL patch:
@ replace_dma_zalloc_coherent @
expression dev, size, data, handle, flags;
@@
-dma_zalloc_coherent(dev, size, handle, flags)
+dma_alloc_coherent(dev, size, handle, flags)
Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
[hch: re-ran the script on the latest tree]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 4d40878e395a..f52e2c46e6a7 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
| @@ -109,8 +109,8 @@ int i40e_allocate_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem, | |||
| 109 | struct i40e_pf *pf = (struct i40e_pf *)hw->back; | 109 | struct i40e_pf *pf = (struct i40e_pf *)hw->back; |
| 110 | 110 | ||
| 111 | mem->size = ALIGN(size, alignment); | 111 | mem->size = ALIGN(size, alignment); |
| 112 | mem->va = dma_zalloc_coherent(&pf->pdev->dev, mem->size, | 112 | mem->va = dma_alloc_coherent(&pf->pdev->dev, mem->size, &mem->pa, |
| 113 | &mem->pa, GFP_KERNEL); | 113 | GFP_KERNEL); |
| 114 | if (!mem->va) | 114 | if (!mem->va) |
| 115 | return -ENOMEM; | 115 | return -ENOMEM; |
| 116 | 116 | ||
