Index: uspace/drv/bus/usb/xhci/commands.c
===================================================================
--- uspace/drv/bus/usb/xhci/commands.c	(revision 230ef1c75b26447104e88810105f205e628abffd)
+++ uspace/drv/bus/usb/xhci/commands.c	(revision 837581fd9d3115e67bc69b9b973fb443d8c9f503)
@@ -187,6 +187,5 @@
 	}
 
-	usb_log_debug2("HC(%p): Sending command:", hc);
-	xhci_dump_trb(&cmd->_header.trb);
+	usb_log_debug("Sending command %s", xhci_trb_str_type(TRB_TYPE(cmd->_header.trb)));
 
 	list_append(&cmd->_header.link, &cr->cmd_list);
@@ -297,6 +296,4 @@
 	assert(trb);
 
-	usb_log_debug2("HC(%p) Command completed.", hc);
-
 	fibril_mutex_lock(&cr->guard);
 
@@ -314,4 +311,5 @@
 		 * requesting thread is waiting inside the CV.
 		 */
+		usb_log_debug2("Command ring stopped.");
 		fibril_condvar_broadcast(&cr->stopped_cv);
 		fibril_mutex_unlock(&cr->guard);
@@ -321,5 +319,5 @@
 	xhci_cmd_t *command = find_command(hc, phys);
 	if (command == NULL) {
-		usb_log_error("No command struct for this completion event found.");
+		usb_log_error("No command struct for completion event found.");
 
 		if (code != XHCI_TRBC_SUCCESS)
@@ -338,25 +336,9 @@
 	command->slot_id = TRB_GET_SLOT(*trb);
 
-	usb_log_debug2("Completed command trb: %s", xhci_trb_str_type(TRB_TYPE(command->_header.trb)));
+	usb_log_debug("Completed command %s", xhci_trb_str_type(TRB_TYPE(command->_header.trb)));
 
 	if (code != XHCI_TRBC_SUCCESS) {
 		report_error(code);
 		xhci_dump_trb(&command->_header.trb);
-	}
-
-	switch (TRB_TYPE(command->_header.trb)) {
-	case XHCI_TRB_TYPE_NO_OP_CMD:
-	case XHCI_TRB_TYPE_ENABLE_SLOT_CMD:
-	case XHCI_TRB_TYPE_DISABLE_SLOT_CMD:
-	case XHCI_TRB_TYPE_ADDRESS_DEVICE_CMD:
-	case XHCI_TRB_TYPE_CONFIGURE_ENDPOINT_CMD:
-	case XHCI_TRB_TYPE_EVALUATE_CONTEXT_CMD:
-	case XHCI_TRB_TYPE_RESET_ENDPOINT_CMD:
-	case XHCI_TRB_TYPE_STOP_ENDPOINT_CMD:
-	case XHCI_TRB_TYPE_RESET_DEVICE_CMD:
-		break;
-	default:
-		usb_log_debug2("Unsupported command trb: %s", xhci_trb_str_type(TRB_TYPE(command->_header.trb)));
-		return ENAK;
 	}
 
@@ -613,9 +595,10 @@
 		// The CR is either stopped, or different fibril is already
 		// restarting it.
+		usb_log_debug2("Command ring already being stopped.");
 		fibril_mutex_unlock(&cr->guard);
 		return EOK;
 	}
 
-	usb_log_error("HC(%p): Timeout while waiting for command: aborting current command.", hc);
+	usb_log_error("Timeout while waiting for command: aborting current command.");
 
 	cr->state = XHCI_CR_STATE_CHANGING;
@@ -631,5 +614,5 @@
 		 * reset it.
 		 */
-		usb_log_error("HC(%p): Command didn't abort.", hc);
+		usb_log_error("Command didn't abort.");
 
 		cr->state = XHCI_CR_STATE_CLOSED;
@@ -643,5 +626,5 @@
 	}
 
-	usb_log_error("HC(%p): Command ring stopped. Starting again.", hc);
+	usb_log_error("Command ring stopped. Starting again.");
 	hc_ring_doorbell(hc, 0, 0);
 
Index: uspace/drv/bus/usb/xhci/hc.c
===================================================================
--- uspace/drv/bus/usb/xhci/hc.c	(revision 230ef1c75b26447104e88810105f205e628abffd)
+++ uspace/drv/bus/usb/xhci/hc.c	(revision 837581fd9d3115e67bc69b9b973fb443d8c9f503)
@@ -507,5 +507,5 @@
 	}
 
-	usb_log_debug2("HC(%p): Polled status: %x", hc, *status);
+	usb_log_debug2("Polled status: %x", hc, *status);
 	return EOK;
 }
@@ -513,4 +513,5 @@
 static int xhci_handle_mfindex_wrap_event(xhci_hc_t *hc, xhci_trb_t *trb)
 {
+	usb_log_debug2("Microframe index wrapped.", hc, *status);
 	struct timeval tv;
 	getuptime(&tv);
@@ -634,5 +635,5 @@
 	xhci_rh_fini(&hc->rh);
 	pio_disable(hc->reg_base, RNGSZ(hc->mmio_range));
-	usb_log_info("HC(%p): Finalized.", hc);
+	usb_log_info("Finalized.");
 }