scsi: qla2xxx: Replace vmalloc + memset with vzalloc
Subsystems (2)
PATCH 1/3 scsi: qla2xxx: Replace vmalloc + memset with vzalloc
Use vzalloc instead of using vmalloc to allocate memory and then zeroing it with memset.
This simplifies the code.
Signed-off-by Chuhong Yuan <[email protected]>
---
drivers/scsi/qla2xxx/qla_attr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +2 -4
@@ -382,7 +382,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj, ha->optrom_region_size = size; ha->optrom_state =QLA_SREADING ; - ha->optrom_buffer =vmalloc (ha->optrom_region_size); + ha->optrom_buffer =vzalloc (ha->optrom_region_size);if (ha->optrom_buffer ==NULL ) {ql_log (ql_log_warn, vha,0x7062 , "Unable to allocate memory for optrom retrieval "
@@ -404,7 +404,6 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,"Reading flash region -- 0x%x/0x%x.\n" , ha->optrom_region_start, ha->optrom_region_size); -memset (ha->optrom_buffer,0 , ha->optrom_region_size); ha->isp_ops->read_optrom (vha, ha->optrom_buffer, ha->optrom_region_start, ha->optrom_region_size);break ;
@@ -457,7 +456,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj, ha->optrom_region_size = size; ha->optrom_state =QLA_SWRITING ; - ha->optrom_buffer =vmalloc (ha->optrom_region_size); + ha->optrom_buffer =vzalloc (ha->optrom_region_size);if (ha->optrom_buffer ==NULL ) {ql_log (ql_log_warn, vha,0x7066 , "Unable to allocate memory for optrom update "
@@ -472,7 +471,6 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,"Staging flash region write -- 0x%x/0x%x.\n" , ha->optrom_region_start, ha->optrom_region_size); -memset (ha->optrom_buffer,0 , ha->optrom_region_size);break ;case 3 :if (ha->optrom_state !=QLA_SWRITING ) {
Signature · 1 line
2.20.1
Martin K. Petersen
AppliedChuhong,
Quoted 2 lines
Use vzalloc instead of using vmalloc to allocate memory and then zeroing it with memset. This simplifies the code.
Applied to 5.4/scsi-queue. Thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering