Skip to contentSkip to conversation

scsi/aic94xx/aic94xx_hwi.c: Use dma_pool_zalloc

PATCH Applied Souptick Joarder 3 participants 4 messages Nov 1, 2018 – Nov 22, 2018 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi/aic94xx/aic94xx_hwi.c: Use dma_pool_zalloc

Replaced dma_pool_alloc + memset with dma_pool_zalloc

---
 drivers/scsi/aic94xx/aic94xx_hwi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/aic94xx/aic94xx_hwi.c +1 -2
index 3b8ad55e59de..2bc7615193bd 100644
@@ -1057,14 +1057,13 @@ static struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha,
 
 	if (ascb) {
 		ascb->dma_scb.size = sizeof(struct scb);
-		ascb->dma_scb.vaddr = dma_pool_alloc(asd_ha->scb_pool,
+		ascb->dma_scb.vaddr = dma_pool_zalloc(asd_ha->scb_pool,
 						     gfp_flags,
 						    &ascb->dma_scb.dma_handle);
 		if (!ascb->dma_scb.vaddr) {
 			kmem_cache_free(asd_ascb_cache, ascb);
 			return NULL;
 		}
-		memset(ascb->dma_scb.vaddr, 0, sizeof(struct scb));
 		asd_init_ascb(asd_ha, ascb);
 
 		spin_lock_irqsave(&seq->tc_index_lock, flags);
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Souptick Joarder

Replaced dma_pool_alloc + memset with dma_pool_zalloc

-Kees

Quoted 27 lines
---
 drivers/scsi/aic94xx/aic94xx_hwi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/aic94xx/aic94xx_hwi.c +1 -3
index 3b8ad55e59de..2bc7615193bd 100644
@@ -1057,14 +1057,13 @@ static struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha,
 
        if (ascb) {
                ascb->dma_scb.size = sizeof(struct scb);
-               ascb->dma_scb.vaddr = dma_pool_alloc(asd_ha->scb_pool,
+               ascb->dma_scb.vaddr = dma_pool_zalloc(asd_ha->scb_pool,
                                                     gfp_flags,
                                                    &ascb->dma_scb.dma_handle);
                if (!ascb->dma_scb.vaddr) {
                        kmem_cache_free(asd_ascb_cache, ascb);
                        return NULL;
                }
-               memset(ascb->dma_scb.vaddr, 0, sizeof(struct scb));
                asd_init_ascb(asd_ha, ascb);
 
                spin_lock_irqsave(&seq->tc_index_lock, flags);
--

2.17.1

Signature · 1 line
Kees Cook
#2 lore raw
Quoted 8 lines · Kees Cook
Quoted 4 lines · Souptick Joarder

Replaced dma_pool_alloc + memset with dma_pool_zalloc

Thanks Kees.

Quoted 35 lines

-Kees

Quoted 25 lines
---
 drivers/scsi/aic94xx/aic94xx_hwi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/aic94xx/aic94xx_hwi.c +1 -3
index 3b8ad55e59de..2bc7615193bd 100644
@@ -1057,14 +1057,13 @@ static struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha,
 
        if (ascb) {
                ascb->dma_scb.size = sizeof(struct scb);
-               ascb->dma_scb.vaddr = dma_pool_alloc(asd_ha->scb_pool,
+               ascb->dma_scb.vaddr = dma_pool_zalloc(asd_ha->scb_pool,
                                                     gfp_flags,
                                                    &ascb->dma_scb.dma_handle);
                if (!ascb->dma_scb.vaddr) {
                        kmem_cache_free(asd_ascb_cache, ascb);
                        return NULL;
                }
-               memset(ascb->dma_scb.vaddr, 0, sizeof(struct scb));
                asd_init_ascb(asd_ha, ascb);
 
                spin_lock_irqsave(&seq->tc_index_lock, flags);
--
Quoted 2 lines

2.17.1

--
Kees Cook