Commit 56cc8fae authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Martin K. Petersen
Browse files

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: default avatarChuhong Yuan <hslester96@gmail.com>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 22d5aa3a

drivers/scsi/qla2xxx/qla_attr.c

+2 −4
Original line number Diff line number Diff line
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE