diff options
author | Chad Dupuis <chad.dupuis@qlogic.com> | 2012-05-15 14:34:11 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-22 06:15:18 -0400 |
commit | 008dda6650db2c8cd312d86ebe4a6c3a11daecd9 (patch) | |
tree | dc7a4f49fa47038712046710f88c0f1fc60d3c84 /drivers/scsi/qla2xxx/qla_nx.c | |
parent | 24d9ee8549aa5d0234fd4d0f19fee03d1dc007e4 (diff) |
[SCSI] qla2xxx: Remove unneeded DPC wakeups from qla82xx_watchdog.
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>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_nx.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_nx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index de722a933438..6f8850c38b3e 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c | |||
@@ -3352,13 +3352,11 @@ void qla82xx_watchdog(scsi_qla_host_t *vha) | |||
3352 | ql_log(ql_log_warn, vha, 0x6001, | 3352 | ql_log(ql_log_warn, vha, 0x6001, |
3353 | "Adapter reset needed.\n"); | 3353 | "Adapter reset needed.\n"); |
3354 | set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); | 3354 | set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); |
3355 | qla2xxx_wake_dpc(vha); | ||
3356 | } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT && | 3355 | } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT && |
3357 | !test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags)) { | 3356 | !test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags)) { |
3358 | ql_log(ql_log_warn, vha, 0x6002, | 3357 | ql_log(ql_log_warn, vha, 0x6002, |
3359 | "Quiescent needed.\n"); | 3358 | "Quiescent needed.\n"); |
3360 | set_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags); | 3359 | set_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags); |
3361 | qla2xxx_wake_dpc(vha); | ||
3362 | } else { | 3360 | } else { |
3363 | if (qla82xx_check_fw_alive(vha)) { | 3361 | if (qla82xx_check_fw_alive(vha)) { |
3364 | ql_dbg(ql_dbg_timer, vha, 0x6011, | 3362 | ql_dbg(ql_dbg_timer, vha, 0x6011, |
@@ -3398,7 +3396,6 @@ void qla82xx_watchdog(scsi_qla_host_t *vha) | |||
3398 | set_bit(ISP_ABORT_NEEDED, | 3396 | set_bit(ISP_ABORT_NEEDED, |
3399 | &vha->dpc_flags); | 3397 | &vha->dpc_flags); |
3400 | } | 3398 | } |
3401 | qla2xxx_wake_dpc(vha); | ||
3402 | ha->flags.isp82xx_fw_hung = 1; | 3399 | ha->flags.isp82xx_fw_hung = 1; |
3403 | ql_log(ql_log_warn, vha, 0x6007, "Firmware hung.\n"); | 3400 | ql_log(ql_log_warn, vha, 0x6007, "Firmware hung.\n"); |
3404 | qla82xx_clear_pending_mbx(vha); | 3401 | qla82xx_clear_pending_mbx(vha); |