Index: uspace/drv/bus/usb/ehci/ehci_bus.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_bus.c	(revision e8277c08c42306cd41c856f8c5f4dde41373117c)
+++ uspace/drv/bus/usb/ehci/ehci_bus.c	(revision b3573772a2359da2498360d630ee4e92272fd61c)
@@ -163,5 +163,4 @@
 	.endpoint_register = ehci_register_ep,
 	.endpoint_unregister = ehci_unregister_ep,
-	.endpoint_count_bw = bandwidth_count_usb20,
 
 	.batch_create = ehci_create_batch,
@@ -178,5 +177,5 @@
 	bus_t *bus_base = (bus_t *) bus;
 
-	usb2_bus_init(usb2_bus, BANDWIDTH_AVAILABLE_USB20);
+	usb2_bus_init(usb2_bus, &bandwidth_accounting_usb2);
 	bus_base->ops = &ehci_bus_ops;
 
Index: uspace/drv/bus/usb/ohci/ohci_bus.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_bus.c	(revision e8277c08c42306cd41c856f8c5f4dde41373117c)
+++ uspace/drv/bus/usb/ohci/ohci_bus.c	(revision b3573772a2359da2498360d630ee4e92272fd61c)
@@ -171,5 +171,4 @@
 	.endpoint_register = ohci_register_ep,
 	.endpoint_unregister = ohci_unregister_ep,
-	.endpoint_count_bw = bandwidth_count_usb11,
 
 	.batch_create = ohci_create_batch,
@@ -187,5 +186,5 @@
 	bus_t *bus_base = (bus_t *) bus;
 
-	usb2_bus_init(usb2_bus, BANDWIDTH_AVAILABLE_USB11);
+	usb2_bus_init(usb2_bus, &bandwidth_accounting_usb11);
 	bus_base->ops = &ohci_bus_ops;
 
Index: uspace/drv/bus/usb/uhci/hc.c
===================================================================
--- uspace/drv/bus/usb/uhci/hc.c	(revision e8277c08c42306cd41c856f8c5f4dde41373117c)
+++ uspace/drv/bus/usb/uhci/hc.c	(revision b3573772a2359da2498360d630ee4e92272fd61c)
@@ -418,5 +418,4 @@
 	.endpoint_register = endpoint_register,
 	.endpoint_unregister = endpoint_unregister,
-	.endpoint_count_bw = bandwidth_count_usb11,
 
 	.batch_create = create_transfer_batch,
@@ -439,5 +438,5 @@
 	assert(instance);
 
-	usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11);
+	usb2_bus_init(&instance->bus, &bandwidth_accounting_usb11);
 
 	bus_t *bus = (bus_t *) &instance->bus;
Index: uspace/drv/bus/usb/vhc/transfer.c
===================================================================
--- uspace/drv/bus/usb/vhc/transfer.c	(revision e8277c08c42306cd41c856f8c5f4dde41373117c)
+++ uspace/drv/bus/usb/vhc/transfer.c	(revision b3573772a2359da2498360d630ee4e92272fd61c)
@@ -166,5 +166,4 @@
 	.parent = &usb2_bus_ops,
 
-	.endpoint_count_bw = bandwidth_count_usb11,
 	.batch_create = batch_create,
 	.batch_schedule = vhc_schedule,
@@ -176,5 +175,5 @@
 	list_initialize(&instance->devices);
 	fibril_mutex_initialize(&instance->guard);
-	usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11);
+	usb2_bus_init(&instance->bus, &bandwidth_accounting_usb11);
 	instance->bus.base.ops = &vhc_bus_ops;
 	return virthub_init(&instance->hub, "root hub");