Index: uspace/drv/bus/adb/cuda_adb/cuda_adb.c
===================================================================
--- uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision cb19590105311e1ee62c673901c4bdaf9d1d8636)
+++ uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
@@ -55,5 +55,5 @@
 #define NAME  "cuda_adb"
 
-static void cuda_dev_connection(cap_call_handle_t, ipc_call_t *, void *);
+static void cuda_dev_connection(ipc_call_t *, void *);
 static errno_t cuda_init(cuda_t *);
 static void cuda_irq_handler(ipc_call_t *, void *);
@@ -198,22 +198,20 @@
 
 /** Device connection handler */
-static void cuda_dev_connection(cap_call_handle_t icall_handle,
-    ipc_call_t *icall, void *arg)
+static void cuda_dev_connection(ipc_call_t *icall, void *arg)
 {
 	adb_dev_t *dev = (adb_dev_t *) ddf_fun_data_get((ddf_fun_t *) arg);
-	cap_call_handle_t chandle;
 	ipc_call_t call;
 	sysarg_t method;
 
 	/* Answer the IPC_M_CONNECT_ME_TO call. */
-	async_answer_0(icall_handle, EOK);
+	async_answer_0(icall, EOK);
 
 	while (true) {
-		chandle = async_get_call(&call);
+		async_get_call(&call);
 		method = IPC_GET_IMETHOD(call);
 
 		if (!method) {
 			/* The other side has hung up. */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			return;
 		}
@@ -223,7 +221,7 @@
 		if (sess != NULL) {
 			dev->client_sess = sess;
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 		} else {
-			async_answer_0(chandle, EINVAL);
+			async_answer_0(&call, EINVAL);
 		}
 	}
Index: uspace/drv/bus/usb/vhc/conndev.c
===================================================================
--- uspace/drv/bus/usb/vhc/conndev.c	(revision cb19590105311e1ee62c673901c4bdaf9d1d8636)
+++ uspace/drv/bus/usb/vhc/conndev.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
@@ -89,10 +89,9 @@
 /** Default handler for IPC methods not handled by DDF.
  *
- * @param fun           Device handling the call.
- * @param icall_handle  Call handle.
- * @param icall         Call data.
+ * @param fun   Device handling the call.
+ * @param icall Call data.
+ *
  */
-void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
-    ipc_call_t *icall)
+void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall)
 {
 	vhc_data_t *vhc = ddf_fun_data_get(fun);
@@ -104,10 +103,10 @@
 		errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
 		if (rc != EOK) {
-			async_answer_0(icall_handle, rc);
+			async_answer_0(icall, rc);
 			async_hangup(callback);
 			return;
 		}
 
-		async_answer_0(icall_handle, EOK);
+		async_answer_0(icall, EOK);
 
 		receive_device_name(callback);
@@ -116,5 +115,5 @@
 		    plugged_device_name, plugged_device_handle);
 	} else
-		async_answer_0(icall_handle, EINVAL);
+		async_answer_0(icall, EINVAL);
 }
 
Index: uspace/drv/bus/usb/vhc/vhcd.h
===================================================================
--- uspace/drv/bus/usb/vhc/vhcd.h	(revision cb19590105311e1ee62c673901c4bdaf9d1d8636)
+++ uspace/drv/bus/usb/vhc/vhcd.h	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
@@ -88,6 +88,5 @@
 
 void on_client_close(ddf_fun_t *fun);
-void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
-    ipc_call_t *icall);
+void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall);
 
 errno_t vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *);