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/scsi/3w-sas.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/scsi/3w-sas.c')
-rw-r--r-- | drivers/scsi/3w-sas.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index e8f5f7c63190..cd096104bcec 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c | |||
@@ -646,8 +646,9 @@ static int twl_allocate_memory(TW_Device_Extension *tw_dev, int size, int which) | |||
646 | unsigned long *cpu_addr; | 646 | unsigned long *cpu_addr; |
647 | int retval = 1; | 647 | int retval = 1; |
648 | 648 | ||
649 | cpu_addr = dma_zalloc_coherent(&tw_dev->tw_pci_dev->dev, | 649 | cpu_addr = dma_alloc_coherent(&tw_dev->tw_pci_dev->dev, |
650 | size * TW_Q_LENGTH, &dma_handle, GFP_KERNEL); | 650 | size * TW_Q_LENGTH, &dma_handle, |
651 | GFP_KERNEL); | ||
651 | if (!cpu_addr) { | 652 | if (!cpu_addr) { |
652 | TW_PRINTK(tw_dev->host, TW_DRIVER, 0x5, "Memory allocation failed"); | 653 | TW_PRINTK(tw_dev->host, TW_DRIVER, 0x5, "Memory allocation failed"); |
653 | goto out; | 654 | goto out; |