[PATCH 0/2] media: Use dma_zalloc_coherent to replace dma_alloc_coherent + memset

[PATCH 0/2] media: Use dma_zalloc_coherent to replace dma_alloc_coherent + memset

[zhong jiang]

The issue is detected with the help of Coccinelle.

zhong jiang (2):
  media: ipu3-cio2: Use dma_zalloc_coherent to replace
    dma_alloc_coherent + memset
  media: mtk_vcodec_util: Use dma_zalloc_coherent to replace
    dma_alloc_coherent + memset

 drivers/media/pci/intel/ipu3/ipu3-cio2.c            | 6 ++----
 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

-- 
1.7.12.4

[PATCH 1/2] media: ipu3-cio2: Use dma_zalloc_coherent to replace dma_alloc_coherent + memset

[zhong jiang]

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/media/pci/intel/ipu3/ipu3-cio2.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index 2902715..f0c6374 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -218,13 +218,11 @@ static int cio2_fbpt_init(struct cio2_device *cio2, struct cio2_queue *q)
 {
 	struct device *dev = &cio2->pci_dev->dev;
 
-	q->fbpt = dma_alloc_coherent(dev, CIO2_FBPT_SIZE, &q->fbpt_bus_addr,
-				     GFP_KERNEL);
+	q->fbpt = dma_zalloc_coherent(dev, CIO2_FBPT_SIZE, &q->fbpt_bus_addr,
+				      GFP_KERNEL);
 	if (!q->fbpt)
 		return -ENOMEM;
 
-	memset(q->fbpt, 0, CIO2_FBPT_SIZE);
-
 	return 0;
 }
 
-- 
1.7.12.4

[PATCH 2/2] media: mtk_vcodec_util: Use dma_zalloc_coherent to replace dma_alloc_coherent + memset

[zhong jiang]

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/media/platform/mtk-vcodec/mtk_vcodec_util.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
index 0c28d0b..e80123c 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
@@ -49,16 +49,13 @@ int mtk_vcodec_mem_alloc(struct mtk_vcodec_ctx *data,
 	struct mtk_vcodec_ctx *ctx = (struct mtk_vcodec_ctx *)data;
 	struct device *dev = &ctx->dev->plat_dev->dev;
 
-	mem->va = dma_alloc_coherent(dev, size, &mem->dma_addr, GFP_KERNEL);
-
+	mem->va = dma_zalloc_coherent(dev, size, &mem->dma_addr, GFP_KERNEL);
 	if (!mem->va) {
 		mtk_v4l2_err("%s dma_alloc size=%ld failed!", dev_name(dev),
 			     size);
 		return -ENOMEM;
 	}
 
-	memset(mem->va, 0, size);
-
 	mtk_v4l2_debug(3, "[%d]  - va      = %p", ctx->id, mem->va);
 	mtk_v4l2_debug(3, "[%d]  - dma     = 0x%lx", ctx->id,
 		       (unsigned long)mem->dma_addr);
-- 
1.7.12.4

Re: [PATCH 0/2] media: Use dma_zalloc_coherent to replace dma_alloc_coherent + memset

[zhong jiang]

Ping,  Anyone has any objections about the patcheset?

Best wishes,
zhong jiang
On 2018/8/18 23:16, zhong jiang wrote:
> The issue is detected with the help of Coccinelle.
>
> zhong jiang (2):
>   media: ipu3-cio2: Use dma_zalloc_coherent to replace
>     dma_alloc_coherent + memset
>   media: mtk_vcodec_util: Use dma_zalloc_coherent to replace
>     dma_alloc_coherent + memset
>
>  drivers/media/pci/intel/ipu3/ipu3-cio2.c            | 6 ++----
>  drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c | 5 +----
>  2 files changed, 3 insertions(+), 8 deletions(-)
>

Re: [PATCH 1/2] media: ipu3-cio2: Use dma_zalloc_coherent to replace dma_alloc_coherent + memset

[Bing Bu Cao]

Hi, Jiang

This looks fine for me in ipu3-cio2.
Actually, we already have this change locally, but I think we miss submit it to community.
Thanks!

On 08/18/2018 11:16 PM, zhong jiang 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>
> ---
>  drivers/media/pci/intel/ipu3/ipu3-cio2.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> index 2902715..f0c6374 100644
> --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> @@ -218,13 +218,11 @@ static int cio2_fbpt_init(struct cio2_device *cio2, struct cio2_queue *q)
>  {
>  	struct device *dev = &cio2->pci_dev->dev;
>  
> -	q->fbpt = dma_alloc_coherent(dev, CIO2_FBPT_SIZE, &q->fbpt_bus_addr,
> -				     GFP_KERNEL);
> +	q->fbpt = dma_zalloc_coherent(dev, CIO2_FBPT_SIZE, &q->fbpt_bus_addr,
> +				      GFP_KERNEL);
>  	if (!q->fbpt)
>  		return -ENOMEM;
>  
> -	memset(q->fbpt, 0, CIO2_FBPT_SIZE);
> -
>  	return 0;
>  }
>  

Re: [PATCH 1/2] media: ipu3-cio2: Use dma_zalloc_coherent to replace dma_alloc_coherent + memset

[zhong jiang]

On 2018/8/24 10:58, Bing Bu Cao wrote:
> Hi, Jiang
>
> This looks fine for me in ipu3-cio2.
> Actually, we already have this change locally, but I think we miss submit it to community.
> Thanks!
 It's ok,  Anyway,  Thank you for let me know that.

 Best wishes,
 zhong jiang
> On 08/18/2018 11:16 PM, zhong jiang 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>
>> ---
>>  drivers/media/pci/intel/ipu3/ipu3-cio2.c | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
>> index 2902715..f0c6374 100644
>> --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
>> +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
>> @@ -218,13 +218,11 @@ static int cio2_fbpt_init(struct cio2_device *cio2, struct cio2_queue *q)
>>  {
>>  	struct device *dev = &cio2->pci_dev->dev;
>>  
>> -	q->fbpt = dma_alloc_coherent(dev, CIO2_FBPT_SIZE, &q->fbpt_bus_addr,
>> -				     GFP_KERNEL);
>> +	q->fbpt = dma_zalloc_coherent(dev, CIO2_FBPT_SIZE, &q->fbpt_bus_addr,
>> +				      GFP_KERNEL);
>>  	if (!q->fbpt)
>>  		return -ENOMEM;
>>  
>> -	memset(q->fbpt, 0, CIO2_FBPT_SIZE);
>> -
>>  	return 0;
>>  }
>>  
>
> .
>