Index: uspace/drv/intctl/apic/apic.c
===================================================================
--- uspace/drv/intctl/apic/apic.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/drv/intctl/apic/apic.c	(revision 63d46341182c752620dcc5a2233d205cee1075dd)
@@ -160,11 +160,10 @@
 /** Handle one connection to APIC.
  *
- * @param iid   Hash of the request that opened the connection.
  * @param icall Call data of the request that opened the connection.
- * @param arg	Local argument.
- */
-static void apic_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
-{
-	cap_call_handle_t chandle;
+ * @param arg   Local argument.
+ *
+ */
+static void apic_connection(ipc_call_t *icall, void *arg)
+{
 	ipc_call_t call;
 	apic_t *apic;
@@ -173,14 +172,14 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_0(icall_handle, EOK);
-
-	apic = (apic_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
+	async_answer_0(icall, EOK);
+
+	apic = (apic_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
 
 	while (true) {
-		chandle = async_get_call(&call);
+		async_get_call(&call);
 
 		if (!IPC_GET_IMETHOD(call)) {
 			/* The other side has hung up. */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			return;
 		}
@@ -188,17 +187,17 @@
 		switch (IPC_GET_IMETHOD(call)) {
 		case IRC_ENABLE_INTERRUPT:
-			async_answer_0(chandle, apic_enable_irq(apic,
+			async_answer_0(&call, apic_enable_irq(apic,
 			    IPC_GET_ARG1(call)));
 			break;
 		case IRC_DISABLE_INTERRUPT:
 			/* XXX TODO */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		case IRC_CLEAR_INTERRUPT:
 			/* Noop */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		default:
-			async_answer_0(chandle, EINVAL);
+			async_answer_0(&call, EINVAL);
 			break;
 		}
Index: uspace/drv/intctl/i8259/i8259.c
===================================================================
--- uspace/drv/intctl/i8259/i8259.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/drv/intctl/i8259/i8259.c	(revision 63d46341182c752620dcc5a2233d205cee1075dd)
@@ -89,11 +89,10 @@
 /** Handle one connection to i8259.
  *
- * @param iid   Hash of the request that opened the connection.
  * @param icall Call data of the request that opened the connection.
- * @param arg	Local argument.
- */
-static void i8259_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
-{
-	cap_call_handle_t chandle;
+ * @param arg   Local argument.
+ *
+ */
+static void i8259_connection(ipc_call_t *icall, void *arg)
+{
 	ipc_call_t call;
 	i8259_t *i8259 = NULL /* XXX */;
@@ -102,14 +101,14 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_0(icall_handle, EOK);
-
-	i8259 = (i8259_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
+	async_answer_0(icall, EOK);
+
+	i8259 = (i8259_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
 
 	while (true) {
-		chandle = async_get_call(&call);
+		async_get_call(&call);
 
 		if (!IPC_GET_IMETHOD(call)) {
 			/* The other side has hung up. */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			return;
 		}
@@ -117,17 +116,17 @@
 		switch (IPC_GET_IMETHOD(call)) {
 		case IRC_ENABLE_INTERRUPT:
-			async_answer_0(chandle, pic_enable_irq(i8259,
+			async_answer_0(&call, pic_enable_irq(i8259,
 			    IPC_GET_ARG1(call)));
 			break;
 		case IRC_DISABLE_INTERRUPT:
 			/* XXX TODO */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		case IRC_CLEAR_INTERRUPT:
 			/* Noop */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		default:
-			async_answer_0(chandle, EINVAL);
+			async_answer_0(&call, EINVAL);
 			break;
 		}
Index: uspace/drv/intctl/icp-ic/icp-ic.c
===================================================================
--- uspace/drv/intctl/icp-ic/icp-ic.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/drv/intctl/icp-ic/icp-ic.c	(revision 63d46341182c752620dcc5a2233d205cee1075dd)
@@ -65,11 +65,10 @@
 /** Client connection handler.
  *
- * @param iid   Hash of the request that opened the connection.
  * @param icall Call data of the request that opened the connection.
- * @param arg	Local argument.
+ * @param arg   Local argument.
+ *
  */
-static void icpic_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void icpic_connection(ipc_call_t *icall, void *arg)
 {
-	cap_call_handle_t chandle;
 	ipc_call_t call;
 	icpic_t *icpic;
@@ -78,14 +77,14 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_0(icall_handle, EOK);
+	async_answer_0(icall, EOK);
 
-	icpic = (icpic_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
+	icpic = (icpic_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
 
 	while (true) {
-		chandle = async_get_call(&call);
+		async_get_call(&call);
 
 		if (!IPC_GET_IMETHOD(call)) {
 			/* The other side has hung up. */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			return;
 		}
@@ -93,17 +92,17 @@
 		switch (IPC_GET_IMETHOD(call)) {
 		case IRC_ENABLE_INTERRUPT:
-			async_answer_0(chandle,
+			async_answer_0(&call,
 			    icpic_enable_irq(icpic, IPC_GET_ARG1(call)));
 			break;
 		case IRC_DISABLE_INTERRUPT:
 			/* XXX TODO */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		case IRC_CLEAR_INTERRUPT:
 			/* Noop */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		default:
-			async_answer_0(chandle, EINVAL);
+			async_answer_0(&call, EINVAL);
 			break;
 		}
Index: uspace/drv/intctl/obio/obio.c
===================================================================
--- uspace/drv/intctl/obio/obio.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/drv/intctl/obio/obio.c	(revision 63d46341182c752620dcc5a2233d205cee1075dd)
@@ -69,11 +69,10 @@
 /** Handle one connection to obio.
  *
- * @param iid		Hash of the request that opened the connection.
- * @param icall		Call data of the request that opened the connection.
- * @param arg		Local argument.
+ * @param icall Call data of the request that opened the connection.
+ * @param arg   Local argument.
+ *
  */
-static void obio_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void obio_connection(ipc_call_t *icall, void *arg)
 {
-	cap_call_handle_t chandle;
 	ipc_call_t call;
 	obio_t *obio;
@@ -82,12 +81,13 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_0(icall_handle, EOK);
+	async_answer_0(icall, EOK);
 
-	obio = (obio_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
+	obio = (obio_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
 
 	while (true) {
 		int inr;
 
-		chandle = async_get_call(&call);
+		async_get_call(&call);
+
 		switch (IPC_GET_IMETHOD(call)) {
 		case IRC_ENABLE_INTERRUPT:
@@ -95,17 +95,17 @@
 			pio_set_64(&obio->regs[OBIO_IMR(inr & INO_MASK)],
 			    1UL << 31, 0);
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		case IRC_DISABLE_INTERRUPT:
 			/* XXX TODO */
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		case IRC_CLEAR_INTERRUPT:
 			inr = IPC_GET_ARG1(call);
 			pio_write_64(&obio->regs[OBIO_CIR(inr & INO_MASK)], 0);
-			async_answer_0(chandle, EOK);
+			async_answer_0(&call, EOK);
 			break;
 		default:
-			async_answer_0(chandle, EINVAL);
+			async_answer_0(&call, EINVAL);
 			break;
 		}