openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Bart Van Assche 2013-06-25 11:27:25 -04:00 committed by James Bottomley
parent 6593d5bdbd
commit c5dcfaac94
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/qla2xxx/qla_gs.c
View File

@ -1370,8 +1370,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha)
/* Model description. */ /* Model description. */
eiter = (struct ct_fdmi_hba_attr *) (entries + size); eiter = (struct ct_fdmi_hba_attr *) (entries + size);
eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION); eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION);
if (ha->model_desc) strncpy(eiter->a.model_desc, ha->model_desc, 80);
strncpy(eiter->a.model_desc, ha->model_desc, 80);
alen = strlen(eiter->a.model_desc); alen = strlen(eiter->a.model_desc);
alen += (alen & 3) ? (4 - (alen & 3)) : 4; alen += (alen & 3) ? (4 - (alen & 3)) : 4;
eiter->len = cpu_to_be16(4 + alen); eiter->len = cpu_to_be16(4 + alen);

3
drivers/scsi/qla2xxx/qla_os.c
View File

@ -2839,8 +2839,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
qla2x00_dfs_setup(base_vha); qla2x00_dfs_setup(base_vha);
ql_log(ql_log_info, base_vha, 0x00fb, ql_log(ql_log_info, base_vha, 0x00fb,
"QLogic %s - %s.\n", "QLogic %s - %s.\n", ha->model_number, ha->model_desc);
ha->model_number, ha->model_desc ? ha->model_desc : "");
ql_log(ql_log_info, base_vha, 0x00fc, ql_log(ql_log_info, base_vha, 0x00fc,
"ISP%04X: %s @ %s hdma%c host#=%ld fw=%s.\n", "ISP%04X: %s @ %s hdma%c host#=%ld fw=%s.\n",
pdev->device, ha->isp_ops->pci_info_str(base_vha, pci_info), pdev->device, ha->isp_ops->pci_info_str(base_vha, pci_info),