Index: uspace/lib/usb/include/usb/hc.h
===================================================================
--- uspace/lib/usb/include/usb/hc.h	(revision dbb7e3bbaa6eed2bc18e006f04568dffbd71aa69)
+++ uspace/lib/usb/include/usb/hc.h	(revision a56a13c7b40e6a52751e3e94e14a82368b87728f)
@@ -109,5 +109,17 @@
 }
 
-int usb_ddf_get_hc_handle_by_sid(service_id_t, devman_handle_t *);
+/** Get host controller handle by its class index.
+ *
+ * @param sid Service ID of the HC function.
+ * @param hc_handle Where to store the HC handle
+ *	(can be NULL for existence test only).
+ * @return Error code.
+ */
+static inline int usb_ddf_get_hc_handle_by_sid(
+    service_id_t sid, devman_handle_t *handle)
+{
+	devman_handle_t h;
+	return devman_fun_sid_to_handle(sid, handle ? handle : &h);
+}
 
 #endif
Index: uspace/lib/usb/src/hc.c
===================================================================
--- uspace/lib/usb/src/hc.c	(revision dbb7e3bbaa6eed2bc18e006f04568dffbd71aa69)
+++ uspace/lib/usb/src/hc.c	(revision a56a13c7b40e6a52751e3e94e14a82368b87728f)
@@ -257,22 +257,4 @@
 	return ret;
 }
-/*----------------------------------------------------------------------------*/
-/** Get host controller handle by its class index.
- *
- * @param sid Service ID of the HC function.
- * @param hc_handle Where to store the HC handle
- *	(can be NULL for existence test only).
- * @return Error code.
- */
-int usb_ddf_get_hc_handle_by_sid(service_id_t sid, devman_handle_t *hc_handle)
-{
-	devman_handle_t handle;
-
-	const int ret = devman_fun_sid_to_handle(sid, &handle);
-	if (ret == EOK && hc_handle != NULL)
-		*hc_handle = handle;
-
-	return ret;
-}
 
 /**