]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
brcmfmac: Use zeroing memory allocator than allocator/memset
authorHimanshu Jha <himanshujha199640@gmail.com>
Mon, 8 Jan 2018 20:45:31 +0000 (02:15 +0530)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 11 Jan 2018 19:52:59 +0000 (21:52 +0200)
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>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

index 3c87157f5b8513d7bb00a4602c22859d4b0b1e0f..8752707557bf3c0a37dde088e82a57fd1e27e39d 100644 (file)
@@ -1251,14 +1251,14 @@ static int brcmf_pcie_init_scratchbuffers(struct brcmf_pciedev_info *devinfo)
        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_scratchbuffers(struct brcmf_pciedev_info *devinfo)
               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;