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

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

qla2xxx: Comment out unreachable code 



Comment out the code that is never reached in qla83xx_idc_unlock()
and also in qlt_set_data_offset() to avoid that static source code
analysis tools report warnings for this code.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Acked-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 8cd1943b

drivers/scsi/qla2xxx/qla_os.c

+6 −1
Original line number Diff line number Diff line
@@ -4418,7 +4418,10 @@ qla83xx_idc_lock(scsi_qla_host_t *base_vha, uint16_t requester_id) 
void

qla83xx_idc_unlock(scsi_qla_host_t *base_vha, uint16_t requester_id)

{

	uint16_t options = (requester_id << 15) | BIT_7, retry;

#if 0

	uint16_t options = (requester_id << 15) | BIT_7;

#endif

	uint16_t retry;

	uint32_t data;

	struct qla_hw_data *ha = base_vha->hw;
@@ -4454,6 +4457,7 @@ qla83xx_idc_unlock(scsi_qla_host_t *base_vha, uint16_t requester_id) 


	return;



#if 0

	/* XXX: IDC-unlock implementation using access-control mbx */

	retry = 0;

retry_unlock2:
@@ -4469,6 +4473,7 @@ qla83xx_idc_unlock(scsi_qla_host_t *base_vha, uint16_t requester_id) 
	}



	return;

#endif

}



int

drivers/scsi/qla2xxx/qla_target.c

+9 −7
Original line number Diff line number Diff line
@@ -3712,6 +3712,14 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, 


static int qlt_set_data_offset(struct qla_tgt_cmd *cmd, uint32_t offset)

{

#if 1

	/*

	 * FIXME: Reject non zero SRR relative offset until we can test

	 * this code properly.

	 */

	pr_debug("Rejecting non zero SRR rel_offs: %u\n", offset);

	return -1;

#else

	struct scatterlist *sg, *sgp, *sg_srr, *sg_srr_start = NULL;

	size_t first_offset = 0, rem_offset = offset, tmp = 0;

	int i, sg_srr_cnt, bufflen = 0;
@@ -3721,13 +3729,6 @@ static int qlt_set_data_offset(struct qla_tgt_cmd *cmd, uint32_t offset) 
	    "cmd->sg_cnt: %u, direction: %d\n",

	    cmd, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction);



	/*

	 * FIXME: Reject non zero SRR relative offset until we can test

	 * this code properly.

	 */

	pr_debug("Rejecting non zero SRR rel_offs: %u\n", offset);

	return -1;



	if (!cmd->sg || !cmd->sg_cnt) {

		ql_dbg(ql_dbg_tgt, cmd->vha, 0xe055,

		    "Missing cmd->sg or zero cmd->sg_cnt in"
@@ -3810,6 +3811,7 @@ static int qlt_set_data_offset(struct qla_tgt_cmd *cmd, uint32_t offset) 
		BUG();



	return 0;

#endif

}



static inline int qlt_srr_adjust_data(struct qla_tgt_cmd *cmd,