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/nvme/host/pci.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/nvme/host/pci.c')
-rw-r--r-- | drivers/nvme/host/pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 5a0bf6a24d50..e8d0942c9c92 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c | |||
@@ -1485,8 +1485,8 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) | |||
1485 | if (dev->ctrl.queue_count > qid) | 1485 | if (dev->ctrl.queue_count > qid) |
1486 | return 0; | 1486 | return 0; |
1487 | 1487 | ||
1488 | nvmeq->cqes = dma_zalloc_coherent(dev->dev, CQ_SIZE(depth), | 1488 | nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(depth), |
1489 | &nvmeq->cq_dma_addr, GFP_KERNEL); | 1489 | &nvmeq->cq_dma_addr, GFP_KERNEL); |
1490 | if (!nvmeq->cqes) | 1490 | if (!nvmeq->cqes) |
1491 | goto free_nvmeq; | 1491 | goto free_nvmeq; |
1492 | 1492 | ||
@@ -1915,8 +1915,8 @@ static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred, | |||
1915 | if (dev->ctrl.hmmaxd && dev->ctrl.hmmaxd < max_entries) | 1915 | if (dev->ctrl.hmmaxd && dev->ctrl.hmmaxd < max_entries) |
1916 | max_entries = dev->ctrl.hmmaxd; | 1916 | max_entries = dev->ctrl.hmmaxd; |
1917 | 1917 | ||
1918 | descs = dma_zalloc_coherent(dev->dev, max_entries * sizeof(*descs), | 1918 | descs = dma_alloc_coherent(dev->dev, max_entries * sizeof(*descs), |
1919 | &descs_dma, GFP_KERNEL); | 1919 | &descs_dma, GFP_KERNEL); |
1920 | if (!descs) | 1920 | if (!descs) |
1921 | goto out; | 1921 | goto out; |
1922 | 1922 | ||