]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
qla2xxx: Use dma_zalloc_coherent
authorJoe Perches <joe@perches.com>
Sun, 15 Jun 2014 20:37:51 +0000 (13:37 -0700)
committerChristoph Hellwig <hch@lst.de>
Fri, 25 Jul 2014 21:16:55 +0000 (17:16 -0400)
Use the zeroing function instead of dma_alloc_coherent & memset(,0,)

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/qla2xxx/qla_init.c

index e2184412617d8d0ccce3527dceacfb351fc5b45a..46990f4ceb4097be3acbb98f8235994be33bd475 100644 (file)
@@ -1526,8 +1526,8 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                            FCE_SIZE, ha->fce, ha->fce_dma);
 
                /* Allocate memory for Fibre Channel Event Buffer. */
-               tc = dma_alloc_coherent(&ha->pdev->dev, FCE_SIZE, &tc_dma,
-                   GFP_KERNEL);
+               tc = dma_zalloc_coherent(&ha->pdev->dev, FCE_SIZE, &tc_dma,
+                                        GFP_KERNEL);
                if (!tc) {
                        ql_log(ql_log_warn, vha, 0x00be,
                            "Unable to allocate (%d KB) for FCE.\n",
@@ -1535,7 +1535,6 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                        goto try_eft;
                }
 
-               memset(tc, 0, FCE_SIZE);
                rval = qla2x00_enable_fce_trace(vha, tc_dma, FCE_NUM_BUFFERS,
                    ha->fce_mb, &ha->fce_bufs);
                if (rval) {
@@ -1560,8 +1559,8 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                            EFT_SIZE, ha->eft, ha->eft_dma);
 
                /* Allocate memory for Extended Trace Buffer. */
-               tc = dma_alloc_coherent(&ha->pdev->dev, EFT_SIZE, &tc_dma,
-                   GFP_KERNEL);
+               tc = dma_zalloc_coherent(&ha->pdev->dev, EFT_SIZE, &tc_dma,
+                                        GFP_KERNEL);
                if (!tc) {
                        ql_log(ql_log_warn, vha, 0x00c1,
                            "Unable to allocate (%d KB) for EFT.\n",
@@ -1569,7 +1568,6 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                        goto cont_alloc;
                }
 
-               memset(tc, 0, EFT_SIZE);
                rval = qla2x00_enable_eft_trace(vha, tc_dma, EFT_NUM_BUFFERS);
                if (rval) {
                        ql_log(ql_log_warn, vha, 0x00c2,