Index: uspace/drv/bus/usb/xhci/bus.c
===================================================================
--- uspace/drv/bus/usb/xhci/bus.c	(revision 6455d39e0502427e5c374bc86c13191c94b14f51)
+++ uspace/drv/bus/usb/xhci/bus.c	(revision 10cd715240ae1db3090d2fb49f7185790adc313a)
@@ -209,5 +209,5 @@
 
 err_address:
-	bus_release_address(&bus->base, dev->address);
+	// TODO: deaddress device
 	return err;
 }
@@ -505,14 +505,6 @@
 }
 
-static int request_address(bus_t *bus_base, usb_address_t *addr, bool strict, usb_speed_t speed)
-{
-	assert(addr);
-
-	if (*addr != USB_ADDRESS_DEFAULT)
-		/* xHCI does not allow software to assign addresses. */
-		return ENOTSUP;
-
-	assert(strict);
-
+static int reserve_default_address(bus_t *bus_base, usb_speed_t speed)
+{
 	xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base);
 
@@ -525,9 +517,6 @@
 }
 
-static int release_address(bus_t *bus_base, usb_address_t addr)
-{
-	if (addr != USB_ADDRESS_DEFAULT)
-		return ENOTSUP;
-
+static int release_default_address(bus_t *bus_base)
+{
 	xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base);
 
@@ -562,8 +551,8 @@
 	BIND_OP(find_endpoint)
 
-	BIND_OP(request_address)
-	BIND_OP(release_address)
+	BIND_OP(reserve_default_address)
+	BIND_OP(release_default_address)
+
 	BIND_OP(reset_toggle)
-
 	BIND_OP(count_bw)