Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5dcfaac authored by Bart Van Assche's avatar Bart Van Assche Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Remove two superfluous tests. 



Since ha->model_desc is an array comparing it against NULL is
superfluous. Hence remove these tests.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 6593d5bd

drivers/scsi/qla2xxx/qla_gs.c

+1 −2
Original line number Diff line number Diff line
@@ -1370,7 +1370,6 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 
	/* Model description. */

	eiter = (struct ct_fdmi_hba_attr *) (entries + size);

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION);

	if (ha->model_desc)

	strncpy(eiter->a.model_desc, ha->model_desc, 80);

	alen = strlen(eiter->a.model_desc);

	alen += (alen & 3) ? (4 - (alen & 3)) : 4;

drivers/scsi/qla2xxx/qla_os.c

+1 −2
Original line number Diff line number Diff line
@@ -2839,8 +2839,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	qla2x00_dfs_setup(base_vha);



	ql_log(ql_log_info, base_vha, 0x00fb,

	    "QLogic %s - %s.\n",

	    ha->model_number, ha->model_desc ? ha->model_desc : "");

	    "QLogic %s - %s.\n", ha->model_number, ha->model_desc);

	ql_log(ql_log_info, base_vha, 0x00fc,

	    "ISP%04X: %s @ %s hdma%c host#=%ld fw=%s.\n",

	    pdev->device, ha->isp_ops->pci_info_str(base_vha, pci_info),