60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
|
From b7acadaf038740c43515dc1548f43d01cc92823a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Himanshu Jha <himanshujha199640@gmail.com>
|
||
|
|
Date: Tue, 9 Jan 2018 02:15:31 +0530
|
||
|
|
Subject: [PATCH] brcmfmac: Use zeroing memory allocator than allocator/memset
|
||
|
|
|
||
|
|
Use dma_zalloc_coherent for allocating zeroed
|
||
|
|
memory and remove unnecessary memset function.
|
||
|
|
|
||
|
|
Generated-by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci
|
||
|
|
|
||
|
|
Suggested-by: Luis R. Rodriguez <mcgrof@kernel.org>
|
||
|
|
Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||
|
|
---
|
||
|
|
.../net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 20 ++++++++++----------
|
||
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||
|
|
@@ -1251,14 +1251,14 @@ static int brcmf_pcie_init_scratchbuffer
|
||
|
|
u64 address;
|
||
|
|
u32 addr;
|
||
|
|
|
||
|
|
- devinfo->shared.scratch = dma_alloc_coherent(&devinfo->pdev->dev,
|
||
|
|
- BRCMF_DMA_D2H_SCRATCH_BUF_LEN,
|
||
|
|
- &devinfo->shared.scratch_dmahandle, GFP_KERNEL);
|
||
|
|
+ devinfo->shared.scratch =
|
||
|
|
+ dma_zalloc_coherent(&devinfo->pdev->dev,
|
||
|
|
+ BRCMF_DMA_D2H_SCRATCH_BUF_LEN,
|
||
|
|
+ &devinfo->shared.scratch_dmahandle,
|
||
|
|
+ GFP_KERNEL);
|
||
|
|
if (!devinfo->shared.scratch)
|
||
|
|
goto fail;
|
||
|
|
|
||
|
|
- memset(devinfo->shared.scratch, 0, BRCMF_DMA_D2H_SCRATCH_BUF_LEN);
|
||
|
|
-
|
||
|
|
addr = devinfo->shared.tcm_base_address +
|
||
|
|
BRCMF_SHARED_DMA_SCRATCH_ADDR_OFFSET;
|
||
|
|
address = (u64)devinfo->shared.scratch_dmahandle;
|
||
|
|
@@ -1268,14 +1268,14 @@ static int brcmf_pcie_init_scratchbuffer
|
||
|
|
BRCMF_SHARED_DMA_SCRATCH_LEN_OFFSET;
|
||
|
|
brcmf_pcie_write_tcm32(devinfo, addr, BRCMF_DMA_D2H_SCRATCH_BUF_LEN);
|
||
|
|
|
||
|
|
- devinfo->shared.ringupd = dma_alloc_coherent(&devinfo->pdev->dev,
|
||
|
|
- BRCMF_DMA_D2H_RINGUPD_BUF_LEN,
|
||
|
|
- &devinfo->shared.ringupd_dmahandle, GFP_KERNEL);
|
||
|
|
+ devinfo->shared.ringupd =
|
||
|
|
+ dma_zalloc_coherent(&devinfo->pdev->dev,
|
||
|
|
+ BRCMF_DMA_D2H_RINGUPD_BUF_LEN,
|
||
|
|
+ &devinfo->shared.ringupd_dmahandle,
|
||
|
|
+ GFP_KERNEL);
|
||
|
|
if (!devinfo->shared.ringupd)
|
||
|
|
goto fail;
|
||
|
|
|
||
|
|
- memset(devinfo->shared.ringupd, 0, BRCMF_DMA_D2H_RINGUPD_BUF_LEN);
|
||
|
|
-
|
||
|
|
addr = devinfo->shared.tcm_base_address +
|
||
|
|
BRCMF_SHARED_DMA_RINGUPD_ADDR_OFFSET;
|
||
|
|
address = (u64)devinfo->shared.ringupd_dmahandle;
|