diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c
index a9d5be10a..de5f897d5 100644
--- a/qla2x00t/qla2x00-target/qla2x00t.c
+++ b/qla2x00t/qla2x00-target/qla2x00t.c
@@ -774,7 +774,7 @@ static void q2t_clear_tgt_db(struct q2t_tgt *tgt, bool local_only)
 
 	TRACE_ENTRY();
 
-	TRACE(TRACE_MGMT, "qla2x00t: Clearing targets DB %p", tgt);
+	TRACE(TRACE_MGMT, "qla2x00t: Clearing targets DB for target %p", tgt);
 
 	list_for_each_entry_safe(sess, sess_tmp, &tgt->sess_list,
 					sess_list_entry) {
@@ -4040,7 +4040,7 @@ static int q24_handle_els(scsi_qla_host_t *ha, notify24xx_entry_t *iocb)
 
 	TRACE_ENTRY();
 
-	TRACE(TRACE_MGMT, "qla2x00t(%ld): ELS opcode %x", ha->instance,
+	TRACE_MGMT_DBG("qla2x00t(%ld): ELS opcode %x", ha->instance,
 		iocb->status_subcode);
 
 	switch (iocb->status_subcode) {
@@ -5228,40 +5228,38 @@ static void q2t_async_event(uint16_t code, scsi_qla_host_t *ha,
 		break;
 
 	case MBA_LOOP_UP:
-	{
-		TRACE(TRACE_MGMT, "qla2x00t(%ld): Async LOOP_UP occured "
-			"(m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)", ha->instance,
-			le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),
-			le16_to_cpu(mailbox[3]), le16_to_cpu(mailbox[4]));
+		TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop up occured",
+			ha->instance);
 		if (tgt->link_reinit_iocb_pending) {
 			q24_send_notify_ack(ha, &tgt->link_reinit_iocb, 0, 0, 0);
 			tgt->link_reinit_iocb_pending = 0;
 		}
 		break;
-	}
 
 	case MBA_LIP_OCCURRED:
+		TRACE(TRACE_MGMT, "qla2x00t(%ld): LIP occured", ha->instance);
+		break;
+
 	case MBA_LOOP_DOWN:
+		TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop down occured",
+			ha->instance);
+		break;
+
 	case MBA_LIP_RESET:
-		TRACE(TRACE_MGMT, "qla2x00t(%ld): Async event %#x occured "
-			"(m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)", ha->instance,
-			code, le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),
-			le16_to_cpu(mailbox[3]), le16_to_cpu(mailbox[4]));
+		TRACE(TRACE_MGMT, "qla2x00t(%ld): LIP reset occured",
+			ha->instance);
 		break;
 
 	case MBA_PORT_UPDATE:
 	case MBA_RSCN_UPDATE:
-		TRACE(TRACE_MGMT, "qla2x00t(%ld): Port update async event %#x "
-			"occured: updating the ports database (m[1]=%x, m[2]=%x, "
-			"m[3]=%x, m[4]=%x)", ha->instance, code,
-			le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),
-			le16_to_cpu(mailbox[3]), le16_to_cpu(mailbox[4]));
+		TRACE_MGMT_DBG("qla2x00t(%ld): Port update async event %#x "
+			"occured", ha->instance, code);
 		/* .mark_all_devices_lost() is handled by the initiator driver */
 		break;
 
 	default:
 		TRACE(TRACE_MGMT, "qla2x00t(%ld): Async event %#x occured: "
-			"ignore (m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)",
+			"ignoring (m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)",
 			ha->instance, code,
 			le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),
 			le16_to_cpu(mailbox[3]), le16_to_cpu(mailbox[4]));
diff --git a/qla2x00t/qla_init.c b/qla2x00t/qla_init.c
index c8fc1188b..16090e6a7 100644
--- a/qla2x00t/qla_init.c
+++ b/qla2x00t/qla_init.c
@@ -712,16 +712,10 @@ qla2x00_chip_diag(scsi_qla_host_t *ha)
 
 	DEBUG3(printk("scsi(%ld): Checking mailboxes.\n", ha->host_no));
 	rval = qla2x00_mbx_reg_test(ha);
-	if (rval) {
-		DEBUG(printk("scsi(%ld): Failed mailbox send register test\n",
-		    ha->host_no));
+	if (rval != QLA_SUCCESS)
 		qla_printk(KERN_WARNING, ha,
-		    "Failed mailbox send register test\n");
-	}
-	else {
-		/* Flag a successful rval */
-		rval = QLA_SUCCESS;
-	}
+		    "Failed mailbox send register test (%x)\n", rval);
+
 	spin_lock_irqsave(&ha->hardware_lock, flags);
 
 chip_diag_failed:
@@ -751,15 +745,9 @@ qla24xx_chip_diag(scsi_qla_host_t *ha)
 	ha->fw_transfer_size = REQUEST_ENTRY_SIZE * 1024;
 
 	rval = qla2x00_mbx_reg_test(ha);
-	if (rval) {
-		DEBUG(printk("scsi(%ld): Failed mailbox send register test\n",
-		    ha->host_no));
+	if (rval != QLA_SUCCESS)
 		qla_printk(KERN_WARNING, ha,
-		    "Failed mailbox send register test\n");
-	} else {
-		/* Flag a successful rval */
-		rval = QLA_SUCCESS;
-	}
+		    "Failed mailbox send register test (%x)\n", rval);
 
 	return rval;
 }