提交 8d35a9dc 编写于 作者: S Souptick Joarder 提交者: Martin K. Petersen

scsi: qla4xxx: Use dma_pool_zalloc()

Use dma_pool_zalloc() instead of dma_pool_alloc + memset
Signed-off-by: NSouptick Joarder <jrdr.linux@gmail.com>
Acked-by: NManish Rangankar <Manish.Rangankar@cavium.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
上级 ec92b59c
...@@ -1584,12 +1584,11 @@ int qla4xxx_get_chap(struct scsi_qla_host *ha, char *username, char *password, ...@@ -1584,12 +1584,11 @@ int qla4xxx_get_chap(struct scsi_qla_host *ha, char *username, char *password,
struct ql4_chap_table *chap_table; struct ql4_chap_table *chap_table;
dma_addr_t chap_dma; dma_addr_t chap_dma;
chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma); chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
if (chap_table == NULL) if (chap_table == NULL)
return -ENOMEM; return -ENOMEM;
chap_size = sizeof(struct ql4_chap_table); chap_size = sizeof(struct ql4_chap_table);
memset(chap_table, 0, chap_size);
if (is_qla40XX(ha)) if (is_qla40XX(ha))
offset = FLASH_CHAP_OFFSET | (idx * chap_size); offset = FLASH_CHAP_OFFSET | (idx * chap_size);
...@@ -1648,13 +1647,12 @@ int qla4xxx_set_chap(struct scsi_qla_host *ha, char *username, char *password, ...@@ -1648,13 +1647,12 @@ int qla4xxx_set_chap(struct scsi_qla_host *ha, char *username, char *password,
uint32_t chap_size = 0; uint32_t chap_size = 0;
dma_addr_t chap_dma; dma_addr_t chap_dma;
chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma); chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
if (chap_table == NULL) { if (chap_table == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto exit_set_chap; goto exit_set_chap;
} }
memset(chap_table, 0, sizeof(struct ql4_chap_table));
if (bidi) if (bidi)
chap_table->flags |= BIT_6; /* peer */ chap_table->flags |= BIT_6; /* peer */
else else
......
...@@ -825,12 +825,10 @@ static int qla4xxx_delete_chap(struct Scsi_Host *shost, uint16_t chap_tbl_idx) ...@@ -825,12 +825,10 @@ static int qla4xxx_delete_chap(struct Scsi_Host *shost, uint16_t chap_tbl_idx)
uint32_t chap_size; uint32_t chap_size;
int ret = 0; int ret = 0;
chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma); chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
if (chap_table == NULL) if (chap_table == NULL)
return -ENOMEM; return -ENOMEM;
memset(chap_table, 0, sizeof(struct ql4_chap_table));
if (is_qla80XX(ha)) if (is_qla80XX(ha))
max_chap_entries = (ha->hw.flt_chap_size / 2) / max_chap_entries = (ha->hw.flt_chap_size / 2) /
sizeof(struct ql4_chap_table); sizeof(struct ql4_chap_table);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册