317-v4.16-0001-brcmfmac-Use-zeroing-memory-allocator-than-allocator.patch 2.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. From b7acadaf038740c43515dc1548f43d01cc92823a Mon Sep 17 00:00:00 2001
  2. From: Himanshu Jha <[email protected]>
  3. Date: Tue, 9 Jan 2018 02:15:31 +0530
  4. Subject: [PATCH] brcmfmac: Use zeroing memory allocator than allocator/memset
  5. Use dma_zalloc_coherent for allocating zeroed
  6. memory and remove unnecessary memset function.
  7. Generated-by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci
  8. Suggested-by: Luis R. Rodriguez <[email protected]>
  9. Signed-off-by: Himanshu Jha <[email protected]>
  10. Signed-off-by: Kalle Valo <[email protected]>
  11. ---
  12. .../net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 20 ++++++++++----------
  13. 1 file changed, 10 insertions(+), 10 deletions(-)
  14. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
  15. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
  16. @@ -1251,14 +1251,14 @@ static int brcmf_pcie_init_scratchbuffer
  17. u64 address;
  18. u32 addr;
  19. - devinfo->shared.scratch = dma_alloc_coherent(&devinfo->pdev->dev,
  20. - BRCMF_DMA_D2H_SCRATCH_BUF_LEN,
  21. - &devinfo->shared.scratch_dmahandle, GFP_KERNEL);
  22. + devinfo->shared.scratch =
  23. + dma_zalloc_coherent(&devinfo->pdev->dev,
  24. + BRCMF_DMA_D2H_SCRATCH_BUF_LEN,
  25. + &devinfo->shared.scratch_dmahandle,
  26. + GFP_KERNEL);
  27. if (!devinfo->shared.scratch)
  28. goto fail;
  29. - memset(devinfo->shared.scratch, 0, BRCMF_DMA_D2H_SCRATCH_BUF_LEN);
  30. -
  31. addr = devinfo->shared.tcm_base_address +
  32. BRCMF_SHARED_DMA_SCRATCH_ADDR_OFFSET;
  33. address = (u64)devinfo->shared.scratch_dmahandle;
  34. @@ -1268,14 +1268,14 @@ static int brcmf_pcie_init_scratchbuffer
  35. BRCMF_SHARED_DMA_SCRATCH_LEN_OFFSET;
  36. brcmf_pcie_write_tcm32(devinfo, addr, BRCMF_DMA_D2H_SCRATCH_BUF_LEN);
  37. - devinfo->shared.ringupd = dma_alloc_coherent(&devinfo->pdev->dev,
  38. - BRCMF_DMA_D2H_RINGUPD_BUF_LEN,
  39. - &devinfo->shared.ringupd_dmahandle, GFP_KERNEL);
  40. + devinfo->shared.ringupd =
  41. + dma_zalloc_coherent(&devinfo->pdev->dev,
  42. + BRCMF_DMA_D2H_RINGUPD_BUF_LEN,
  43. + &devinfo->shared.ringupd_dmahandle,
  44. + GFP_KERNEL);
  45. if (!devinfo->shared.ringupd)
  46. goto fail;
  47. - memset(devinfo->shared.ringupd, 0, BRCMF_DMA_D2H_RINGUPD_BUF_LEN);
  48. -
  49. addr = devinfo->shared.tcm_base_address +
  50. BRCMF_SHARED_DMA_RINGUPD_ADDR_OFFSET;
  51. address = (u64)devinfo->shared.ringupd_dmahandle;