diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c index 99b4b44cc..31836f03c 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.c +++ b/qla2x00t/qla2x00-target/qla2x00t.c @@ -5671,7 +5671,7 @@ static void q2t_async_event(uint16_t code, scsi_qla_host_t *vha, break; case MBA_LOOP_UP: - TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop up occured", + TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop up occurred", vha->host_no); if (tgt->link_reinit_iocb_pending) { q24_send_notify_ack(vha, &tgt->link_reinit_iocb, 0, 0, 0); @@ -5684,12 +5684,12 @@ static void q2t_async_event(uint16_t code, scsi_qla_host_t *vha, break; case MBA_LOOP_DOWN: - TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop down occured", + TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop down occurred", vha->host_no); break; case MBA_LIP_RESET: - TRACE(TRACE_MGMT, "qla2x00t(%ld): LIP reset occured", + TRACE(TRACE_MGMT, "qla2x00t(%ld): LIP reset occurred", vha->host_no); break; @@ -5701,7 +5701,7 @@ static void q2t_async_event(uint16_t code, scsi_qla_host_t *vha, break; default: - TRACE(TRACE_MGMT, "qla2x00t(%ld): Async event %#x occured: " + TRACE(TRACE_MGMT, "qla2x00t(%ld): Async event %#x occurred: " "ignoring (m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)", vha->host_no, code, le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]), diff --git a/qla2x00t/qla_init.c b/qla2x00t/qla_init.c index 2b1f9e228..4a65cc235 100644 --- a/qla2x00t/qla_init.c +++ b/qla2x00t/qla_init.c @@ -2796,7 +2796,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha) "%s: exiting normally.\n", __func__); } - /* Restore state if a resync event occured during processing */ + /* Restore state if a resync event occurred during processing */ if (test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags)) { if (test_bit(LOCAL_LOOP_UPDATE, &save_flags)) set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); diff --git a/qla2x00t/qla_iocb.c b/qla2x00t/qla_iocb.c index 92142baeb..58465ee07 100644 --- a/qla2x00t/qla_iocb.c +++ b/qla2x00t/qla_iocb.c @@ -308,7 +308,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt, * qla2x00_start_scsi() - Send a SCSI command to the ISP * @sp: command to send to the ISP * - * Returns non-zero if a failure occured, else zero. + * Returns non-zero if a failure occurred, else zero. */ int qla2x00_start_scsi(srb_t *sp) @@ -520,7 +520,7 @@ EXPORT_SYMBOL(qla2x00_start_iocbs); * * Can be called from both normal and interrupt context. * - * Returns non-zero if a failure occured, else zero. + * Returns non-zero if a failure occurred, else zero. * * Hardware lock must be held on entrance. Might release it, then reacquire. */ @@ -1517,7 +1517,7 @@ crc_queuing_error: * qla24xx_start_scsi() - Send a SCSI command to the ISP * @sp: command to send to the ISP * - * Returns non-zero if a failure occured, else zero. + * Returns non-zero if a failure occurred, else zero. */ int qla24xx_start_scsi(srb_t *sp) diff --git a/qla2x00t/qla_isr.c b/qla2x00t/qla_isr.c index 82f270208..eccce01db 100644 --- a/qla2x00t/qla_isr.c +++ b/qla2x00t/qla_isr.c @@ -571,7 +571,7 @@ skip_rio: case MBA_LIP_RESET: /* LIP reset occurred */ ql_dbg(ql_dbg_async, vha, 0x500c, - "LIP reset occured (%x).\n", mb[1]); + "LIP reset occurred (%x).\n", mb[1]); if (atomic_read(&vha->loop_state) != LOOP_DOWN) { atomic_set(&vha->loop_state, LOOP_DOWN);