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/alacritech/slicoss.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/alacritech/slicoss.c')
-rw-r--r-- | drivers/net/ethernet/alacritech/slicoss.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c index 0b60921c392f..16477aa6d61f 100644 --- a/drivers/net/ethernet/alacritech/slicoss.c +++ b/drivers/net/ethernet/alacritech/slicoss.c | |||
@@ -795,8 +795,8 @@ static int slic_init_stat_queue(struct slic_device *sdev) | |||
795 | size = stq->len * sizeof(*descs) + DESC_ALIGN_MASK; | 795 | size = stq->len * sizeof(*descs) + DESC_ALIGN_MASK; |
796 | 796 | ||
797 | for (i = 0; i < SLIC_NUM_STAT_DESC_ARRAYS; i++) { | 797 | for (i = 0; i < SLIC_NUM_STAT_DESC_ARRAYS; i++) { |
798 | descs = dma_zalloc_coherent(&sdev->pdev->dev, size, &paddr, | 798 | descs = dma_alloc_coherent(&sdev->pdev->dev, size, &paddr, |
799 | GFP_KERNEL); | 799 | GFP_KERNEL); |
800 | if (!descs) { | 800 | if (!descs) { |
801 | netdev_err(sdev->netdev, | 801 | netdev_err(sdev->netdev, |
802 | "failed to allocate status descriptors\n"); | 802 | "failed to allocate status descriptors\n"); |
@@ -1240,8 +1240,8 @@ static int slic_init_shmem(struct slic_device *sdev) | |||
1240 | struct slic_shmem_data *sm_data; | 1240 | struct slic_shmem_data *sm_data; |
1241 | dma_addr_t paddr; | 1241 | dma_addr_t paddr; |
1242 | 1242 | ||
1243 | sm_data = dma_zalloc_coherent(&sdev->pdev->dev, sizeof(*sm_data), | 1243 | sm_data = dma_alloc_coherent(&sdev->pdev->dev, sizeof(*sm_data), |
1244 | &paddr, GFP_KERNEL); | 1244 | &paddr, GFP_KERNEL); |
1245 | if (!sm_data) { | 1245 | if (!sm_data) { |
1246 | dev_err(&sdev->pdev->dev, "failed to allocate shared memory\n"); | 1246 | dev_err(&sdev->pdev->dev, "failed to allocate shared memory\n"); |
1247 | return -ENOMEM; | 1247 | return -ENOMEM; |
@@ -1621,8 +1621,8 @@ static int slic_read_eeprom(struct slic_device *sdev) | |||
1621 | int err = 0; | 1621 | int err = 0; |
1622 | u8 *mac[2]; | 1622 | u8 *mac[2]; |
1623 | 1623 | ||
1624 | eeprom = dma_zalloc_coherent(&sdev->pdev->dev, SLIC_EEPROM_SIZE, | 1624 | eeprom = dma_alloc_coherent(&sdev->pdev->dev, SLIC_EEPROM_SIZE, |
1625 | &paddr, GFP_KERNEL); | 1625 | &paddr, GFP_KERNEL); |
1626 | if (!eeprom) | 1626 | if (!eeprom) |
1627 | return -ENOMEM; | 1627 | return -ENOMEM; |
1628 | 1628 | ||