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

Commit 55fecaec authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: Remove redundant checks for ctrl_context 



Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e7d36b88

drivers/scsi/megaraid/megaraid_sas_fusion.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -991,7 +991,7 @@ megasas_sync_pd_seq_num(struct megasas_instance *instance, bool pend) { 
	dcmd->flags = cpu_to_le16(MFI_FRAME_DIR_READ);

	dcmd->flags = cpu_to_le16(MFI_FRAME_DIR_READ);





	/* Below code is only for non pended DCMD */

	/* Below code is only for non pended DCMD */

	if (instance->ctrl_context && !instance->mask_interrupts)

	if (!instance->mask_interrupts)

		ret = megasas_issue_blocked_cmd(instance, cmd,

		ret = megasas_issue_blocked_cmd(instance, cmd,

			MFI_IO_TIMEOUT_SECS);

			MFI_IO_TIMEOUT_SECS);

	else

	else
@@ -1004,7 +1004,7 @@ megasas_sync_pd_seq_num(struct megasas_instance *instance, bool pend) { 
		ret = -EINVAL;

		ret = -EINVAL;

	}

	}





	if (ret == DCMD_TIMEOUT && instance->ctrl_context)

	if (ret == DCMD_TIMEOUT)

		megaraid_sas_kill_hba(instance);

		megaraid_sas_kill_hba(instance);





	if (ret == DCMD_SUCCESS)

	if (ret == DCMD_SUCCESS)
@@ -1080,13 +1080,13 @@ megasas_get_ld_map_info(struct megasas_instance *instance) 
	dcmd->sgl.sge32[0].phys_addr = cpu_to_le32(ci_h);

	dcmd->sgl.sge32[0].phys_addr = cpu_to_le32(ci_h);

	dcmd->sgl.sge32[0].length = cpu_to_le32(size_map_info);

	dcmd->sgl.sge32[0].length = cpu_to_le32(size_map_info);





	if (instance->ctrl_context && !instance->mask_interrupts)

	if (!instance->mask_interrupts)

		ret = megasas_issue_blocked_cmd(instance, cmd,

		ret = megasas_issue_blocked_cmd(instance, cmd,

			MFI_IO_TIMEOUT_SECS);

			MFI_IO_TIMEOUT_SECS);

	else

	else

		ret = megasas_issue_polled(instance, cmd);

		ret = megasas_issue_polled(instance, cmd);





	if (ret == DCMD_TIMEOUT && instance->ctrl_context)

	if (ret == DCMD_TIMEOUT)

		megaraid_sas_kill_hba(instance);

		megaraid_sas_kill_hba(instance);





	megasas_return_cmd(instance, cmd);

	megasas_return_cmd(instance, cmd);