From: Shivasharan S Date: Wed, 23 Aug 2017 11:46:57 +0000 (-0700) Subject: scsi: megaraid_sas: Use synchronize_irq in target reset case X-Git-Tag: v4.1.12-124.31.3~1065 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aa1f1d1469460a25a2d9a7b07d52d1c2015e47d3;p=users%2Fjedix%2Flinux-maple.git scsi: megaraid_sas: Use synchronize_irq in target reset case Similar to task abort case, use synchronize_irq API in target reset case. Also, remove redundant call to megasas_complete_cmd_dpc_fusion after calling megasas_sync_irqs in task abort case. Signed-off-by: Kashyap Desai Signed-off-by: Shivasharan S Reviewed-by: Hannes Reinecke Reviewed-by: Tomas Henzl Signed-off-by: Martin K. Petersen Orabug: 27625001 Signed-off-by: Jack Vogel Reviewed-by: Martin K. Petersen --- diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 41c522c844415..482217ca0cccb 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -3833,8 +3833,6 @@ megasas_issue_tm(struct megasas_instance *instance, u16 device_handle, else { instance->instancet->disable_intr(instance); megasas_sync_irqs((unsigned long)instance); - megasas_complete_cmd_dpc_fusion - ((unsigned long)instance); instance->instancet->enable_intr(instance); if (scsi_lookup->scmd == NULL) break; @@ -3846,9 +3844,7 @@ megasas_issue_tm(struct megasas_instance *instance, u16 device_handle, if ((channel == 0xFFFFFFFF) && (id == 0xFFFFFFFF)) break; instance->instancet->disable_intr(instance); - msleep(1000); - megasas_complete_cmd_dpc_fusion - ((unsigned long)instance); + megasas_sync_irqs((unsigned long)instance); rc = megasas_track_scsiio(instance, id, channel); instance->instancet->enable_intr(instance);