[SCSI] qla2xxx: Don't toggle RISC interrupt bits after IRQ lines are attached.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index c93cd65083471324e78193b085f956fd7bd77184..2349d2ed48c353acc2f2a91118c91024eddaf00a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2948,21 +2948,9 @@ skip_msi:
 
 clear_risc_ints:
 
-       /*
-        * FIXME: Noted that 8014s were being dropped during NK testing.
-        * Timing deltas during MSI-X/INTa transitions?
-        */
-       if (IS_QLA81XX(ha) || IS_QLA82XX(ha) || IS_QLA83XX(ha))
-               goto fail;
        spin_lock_irq(&ha->hardware_lock);
-       if (IS_FWI2_CAPABLE(ha)) {
-               WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_HOST_INT);
-               WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_RISC_INT);
-       } else {
+       if (!IS_FWI2_CAPABLE(ha))
                WRT_REG_WORD(&reg->isp.semaphore, 0);
-               WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_RISC_INT);
-               WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_HOST_INT);
-       }
        spin_unlock_irq(&ha->hardware_lock);
 
 fail: