korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-27 04:54:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

scsi: megaraid_sas: Remove redundant checks for ctrl_context

Browse Source 
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Shivasharan S 2017-10-19 02:48:51 -07:00 committed by Martin K. Petersen
parent e7d36b8843
commit 55fecaec27
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/megaraid/megaraid_sas_fusion.c
View File

@ -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);