forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] qla2xxx: Fix warning reported by smatch.

Browse source 
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Saurav Kashyap 2013-11-07 02:54:56 -05:00 • committed by James Bottomley
commit c41afc9a75
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/qla2xxx/qla_gbl.h
View file

@ -732,7 +732,7 @@ extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha);
extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha);
extern int qla8044_device_state_handler(struct scsi_qla_host *vha); extern int qla8044_device_state_handler(struct scsi_qla_host *vha);
extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha); extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha);
extern void qla8044_clear_drv_active(struct scsi_qla_host *vha); extern void qla8044_clear_drv_active(struct qla_hw_data *);
void qla8044_get_minidump(struct scsi_qla_host *vha); void qla8044_get_minidump(struct scsi_qla_host *vha);
int qla8044_collect_md_data(struct scsi_qla_host *vha); int qla8044_collect_md_data(struct scsi_qla_host *vha);
extern int qla8044_md_get_template(scsi_qla_host_t *); extern int qla8044_md_get_template(scsi_qla_host_t *);

2
drivers/scsi/qla2xxx/qla_nx.c
View file

@ -3017,7 +3017,7 @@ qla8xxx_dev_failed_handler(scsi_qla_host_t *vha)
qla82xx_clear_drv_active(ha); qla82xx_clear_drv_active(ha);
qla82xx_idc_unlock(ha); qla82xx_idc_unlock(ha);
} else if (IS_QLA8044(ha)) { } else if (IS_QLA8044(ha)) {
qla8044_clear_drv_active(vha); qla8044_clear_drv_active(ha);
qla8044_idc_unlock(ha); qla8044_idc_unlock(ha);
} }

8
drivers/scsi/qla2xxx/qla_nx2.c
View file

@ -1257,10 +1257,10 @@ exit_start_fw:
} }
void void
qla8044_clear_drv_active(struct scsi_qla_host *vha) qla8044_clear_drv_active(struct qla_hw_data *ha)
{ {
uint32_t drv_active; uint32_t drv_active;
struct qla_hw_data *ha = vha->hw; struct scsi_qla_host *vha = pci_get_drvdata(ha->pdev);
drv_active = qla8044_rd_direct(vha, QLA8044_CRB_DRV_ACTIVE_INDEX); drv_active = qla8044_rd_direct(vha, QLA8044_CRB_DRV_ACTIVE_INDEX);
drv_active &= ~(1 << (ha->portnum)); drv_active &= ~(1 << (ha->portnum));
@ -1324,7 +1324,7 @@ qla8044_device_bootstrap(struct scsi_qla_host *vha)
if (rval != QLA_SUCCESS) { if (rval != QLA_SUCCESS) {
ql_log(ql_log_info, vha, 0xb0b3, ql_log(ql_log_info, vha, 0xb0b3,
"%s: HW State: FAILED\n", __func__); "%s: HW State: FAILED\n", __func__);
qla8044_clear_drv_active(vha); qla8044_clear_drv_active(ha);
qla8044_wr_direct(vha, QLA8044_CRB_DEV_STATE_INDEX, qla8044_wr_direct(vha, QLA8044_CRB_DEV_STATE_INDEX,
QLA8XXX_DEV_FAILED); QLA8XXX_DEV_FAILED);
return rval; return rval;
@ -1737,7 +1737,7 @@ qla8044_update_idc_reg(struct scsi_qla_host *vha)
rval = qla8044_set_idc_ver(vha); rval = qla8044_set_idc_ver(vha);
if (rval == QLA_FUNCTION_FAILED) if (rval == QLA_FUNCTION_FAILED)
qla8044_clear_drv_active(vha); qla8044_clear_drv_active(ha);
qla8044_idc_unlock(ha); qla8044_idc_unlock(ha);
exit_update_idc_reg: exit_update_idc_reg:

4
drivers/scsi/qla2xxx/qla_os.c
View file

@ -2881,7 +2881,7 @@ probe_hw_failed:
} }
if (IS_QLA8044(ha)) { if (IS_QLA8044(ha)) {
qla8044_idc_lock(ha); qla8044_idc_lock(ha);
qla8044_clear_drv_active(base_vha); qla8044_clear_drv_active(ha);
qla8044_idc_unlock(ha); qla8044_idc_unlock(ha);
} }
iospace_config_failed: iospace_config_failed:
@ -3045,7 +3045,7 @@ qla2x00_clear_drv_active(scsi_qla_host_t *vha)
if (IS_QLA8044(ha)) { if (IS_QLA8044(ha)) {
qla8044_idc_lock(ha); qla8044_idc_lock(ha);
qla8044_clear_drv_active(vha); qla8044_clear_drv_active(ha);
qla8044_idc_unlock(ha); qla8044_idc_unlock(ha);
} else if (IS_QLA82XX(ha)) { } else if (IS_QLA82XX(ha)) {
qla82xx_idc_lock(ha); qla82xx_idc_lock(ha);