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

Commit c41afc9a authored Nov 07, 2013 by Saurav Kashyap Committed by James Bottomley Dec 19, 2013

[SCSI] qla2xxx: Fix warning reported by smatch.



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>

parent ef80d1e1

drivers/scsi/qla2xxx/qla_gbl.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 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_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);
		int qla8044_collect_md_data(struct scsi_qla_host *vha);
		extern int qla8044_md_get_template(scsi_qla_host_t *);

drivers/scsi/qla2xxx/qla_nx.c

+1 −1

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

drivers/scsi/qla2xxx/qla_nx2.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1257,10 +1257,10 @@ exit_start_fw:
		}

		void
		qla8044_clear_drv_active(struct scsi_qla_host *vha)
		qla8044_clear_drv_active(struct qla_hw_data *ha)
		{
		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 &= ~(1 << (ha->portnum));
		@@ -1324,7 +1324,7 @@ qla8044_device_bootstrap(struct scsi_qla_host *vha)
		if (rval != QLA_SUCCESS) {
		ql_log(ql_log_info, vha, 0xb0b3,
		"%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,
		QLA8XXX_DEV_FAILED);
		return rval;
		@@ -1737,7 +1737,7 @@ qla8044_update_idc_reg(struct scsi_qla_host *vha)

		rval = qla8044_set_idc_ver(vha);
		if (rval == QLA_FUNCTION_FAILED)
		qla8044_clear_drv_active(vha);
		qla8044_clear_drv_active(ha);
		qla8044_idc_unlock(ha);

		exit_update_idc_reg:

drivers/scsi/qla2xxx/qla_os.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2881,7 +2881,7 @@ probe_hw_failed:
		}
		if (IS_QLA8044(ha)) {
		qla8044_idc_lock(ha);
		qla8044_clear_drv_active(base_vha);
		qla8044_clear_drv_active(ha);
		qla8044_idc_unlock(ha);
		}
		iospace_config_failed:
		@@ -3045,7 +3045,7 @@ qla2x00_clear_drv_active(scsi_qla_host_t *vha)

		if (IS_QLA8044(ha)) {
		qla8044_idc_lock(ha);
		qla8044_clear_drv_active(vha);
		qla8044_clear_drv_active(ha);
		qla8044_idc_unlock(ha);
		} else if (IS_QLA82XX(ha)) {
		qla82xx_idc_lock(ha);