Index: uspace/drv/uhci-hcd/uhci.c
===================================================================
--- uspace/drv/uhci-hcd/uhci.c	(revision e247d83f26c1f9fc072e178ccded2ab08a6893c0)
+++ uspace/drv/uhci-hcd/uhci.c	(revision 6bbbcabe6ed64f8953201236527aadafb81ad325)
@@ -61,5 +61,5 @@
 } uhci_t;
 
-static inline uhci_t * dev_to_uhci(ddf_dev_t *dev)
+static inline uhci_t * dev_to_uhci(const ddf_dev_t *dev)
 {
 	assert(dev);
@@ -77,11 +77,15 @@
 {
 	assert(dev);
-	uhci_t *uhci = dev->driver_data;
-	assert(uhci);
+	uhci_t *uhci = dev_to_uhci(dev);
 	hc_t *hc = &uhci->hc;
-	uint16_t status = IPC_GET_ARG1(*call);
+	const uint16_t status = IPC_GET_ARG1(*call);
 	assert(hc);
 	hc_interrupt(hc, status);
 }
+/*----------------------------------------------------------------------------*/
+/** Operations supported by the HC driver */
+static ddf_dev_ops_t hc_ops = {
+	.interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
+};
 /*----------------------------------------------------------------------------*/
 /** Get address of the device identified by handle.
@@ -115,6 +119,5 @@
  * @return Error code.
  */
-static int usb_iface_get_hc_handle(
-    ddf_fun_t *fun, devman_handle_t *handle)
+static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
 	assert(fun);
@@ -131,9 +134,4 @@
 	.get_hc_handle = usb_iface_get_hc_handle,
 	.get_address = usb_iface_get_address
-};
-/*----------------------------------------------------------------------------*/
-/** Operations supported by the HC driver */
-static ddf_dev_ops_t hc_ops = {
-	.interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
 };
 /*----------------------------------------------------------------------------*/