| Message ID | 1534761895-10457-1-git-send-email-zhongjiang@huawei.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] wcn36xx: Use dma_zalloc_coherent instead of dma_alloc_coherent + memset | expand |
zhong jiang <zhongjiang@huawei.com> wrote: > dma_zalloc_coherent has implemented the dma_alloc_coherent() + memset(), > We prefer to dma_zalloc_coherent instead of open-codeing. > > Signed-off-by: zhong jiang <zhongjiang@huawei.com> Doesn't apply as I had already applied similar patch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=ath-next&id=d410e28f3ae476e1572b8893c646ef44fae7bbbd error: patch failed: drivers/net/wireless/ath/wcn36xx/dxe.c:174 error: drivers/net/wireless/ath/wcn36xx/dxe.c: patch does not apply stg import: Diff does not apply cleanly Patch set to Rejected.
diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.c b/drivers/net/wireless/ath/wcn36xx/dxe.c index 06cfe8d..e66ddaa 100644 --- a/drivers/net/wireless/ath/wcn36xx/dxe.c +++ b/drivers/net/wireless/ath/wcn36xx/dxe.c @@ -174,13 +174,11 @@ static int wcn36xx_dxe_init_descs(struct device *dev, struct wcn36xx_dxe_ch *wcn int i; size = wcn_ch->desc_num * sizeof(struct wcn36xx_dxe_desc); - wcn_ch->cpu_addr = dma_alloc_coherent(dev, size, &wcn_ch->dma_addr, - GFP_KERNEL); + wcn_ch->cpu_addr = dma_zalloc_coherent(dev, size, &wcn_ch->dma_addr, + GFP_KERNEL); if (!wcn_ch->cpu_addr) return -ENOMEM; - memset(wcn_ch->cpu_addr, 0, size); - cur_dxe = (struct wcn36xx_dxe_desc *)wcn_ch->cpu_addr; cur_ctl = wcn_ch->head_blk_ctl;
dma_zalloc_coherent has implemented the dma_alloc_coherent() + memset(), We prefer to dma_zalloc_coherent instead of open-codeing. Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- drivers/net/wireless/ath/wcn36xx/dxe.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)