wcn36xx: replace dma_alloc_coherent + memset with dma_zalloc_coherent
diff mbox series

Message ID 20180824171410.22539-1-colin.king@canonical.com
State Rejected
Delegated to: Kalle Valo
Headers show
Series
  • wcn36xx: replace dma_alloc_coherent + memset with dma_zalloc_coherent
Related show

Commit Message

Colin King Aug. 24, 2018, 5:14 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

It is preferable to use dma_zalloc_coherent rather than dam_alloc_coherent
and memset, so use it.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/net/wireless/ath/wcn36xx/dxe.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Kalle Valo Aug. 24, 2018, 5:35 p.m. UTC | #1
Colin King <colin.king@canonical.com> writes:

> From: Colin Ian King <colin.king@canonical.com>
>
> It is preferable to use dma_zalloc_coherent rather than dam_alloc_coherent
> and memset, so use it.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/net/wireless/ath/wcn36xx/dxe.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.c b/drivers/net/wireless/ath/wcn36xx/dxe.c
> index 06cfe8d311f3..e66ddaa39523 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;

Hehe, I think you are the third person submitting a similar patch :)
Anyway, I just applied this few hours ago:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=ath-next&id=d410e28f3ae476e1572b8893c646ef44fae7bbbd

Patch
diff mbox series

diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.c b/drivers/net/wireless/ath/wcn36xx/dxe.c
index 06cfe8d311f3..e66ddaa39523 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;