Index: uspace/drv/bus/usb/xhci/hc.c
===================================================================
--- uspace/drv/bus/usb/xhci/hc.c	(revision 25251bb053fa524ed4b8076c0a1430bfca92c892)
+++ uspace/drv/bus/usb/xhci/hc.c	(revision 928afc8de2b22b210e512572c743aa7975fac188)
@@ -620,11 +620,5 @@
 {
 	assert(hc);
-
-	int err;
-	if ((err = xhci_cmd_sync_inline(hc, DISABLE_SLOT, .slot_id = slot_id))) {
-		return err;
-	}
-
-	return EOK;
+	return xhci_cmd_sync_inline(hc, DISABLE_SLOT, .slot_id = slot_id);
 }
 
@@ -718,41 +712,28 @@
 int hc_configure_device(xhci_hc_t *hc, uint32_t slot_id)
 {
-	int err;
-
 	/* Issue configure endpoint command (sec 4.3.5). */
 	xhci_input_ctx_t *ictx;
-	if ((err = create_valid_input_ctx(&ictx))) {
+	const int err = create_valid_input_ctx(&ictx);
+	if (err)
 		return err;
-	}
+
 	// TODO: Set slot context and other flags. (probably forgot a lot of 'em)
 
-	if ((err = xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx))) {
-		return err;
-	}
-
-	return EOK;
+	return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx);
 }
 
 int hc_deconfigure_device(xhci_hc_t *hc, uint32_t slot_id)
 {
-	int err;
-
 	/* Issue configure endpoint command (sec 4.3.5) with the DC flag. */
-	if ((err = xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .deconfigure = true))) {
-		return err;
-	}
-
-	return EOK;
+	return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .deconfigure = true);
 }
 
 int hc_add_endpoint(xhci_hc_t *hc, uint32_t slot_id, uint8_t ep_idx, xhci_ep_ctx_t *ep_ctx)
 {
-	int err;
-
 	/* Issue configure endpoint command (sec 4.3.5). */
 	xhci_input_ctx_t *ictx;
-	if ((err = create_valid_input_ctx(&ictx))) {
+	const int err = create_valid_input_ctx(&ictx);
+	if (err)
 		return err;
-	}
 
 	XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, ep_idx + 1); /* Preceded by slot ctx */
@@ -760,29 +741,19 @@
 	// TODO: Set slot context and other flags. (probably forgot a lot of 'em)
 
-	if ((err = xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx))) {
-		return err;
-	}
-
-	return EOK;
+	return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx);
 }
 
 int hc_drop_endpoint(xhci_hc_t *hc, uint32_t slot_id, uint8_t ep_idx)
 {
-	int err;
-
 	/* Issue configure endpoint command (sec 4.3.5). */
 	xhci_input_ctx_t *ictx;
-	if ((err = create_valid_input_ctx(&ictx))) {
+	const int err = create_valid_input_ctx(&ictx);
+	if (err)
 		return err;
-	}
 
 	XHCI_INPUT_CTRL_CTX_DROP_SET(ictx->ctrl_ctx, ep_idx + 1); /* Preceded by slot ctx */
 	// TODO: Set slot context and other flags. (probably forgot a lot of 'em)
 
-	if ((err = xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx))) {
-		return err;
-	}
-
-	return EOK;
+	return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx);
 }