Index: uspace/srv/kbd/generic/kbd.c
===================================================================
--- uspace/srv/kbd/generic/kbd.c	(revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0)
+++ uspace/srv/kbd/generic/kbd.c	(revision b74959bd4f5b3c25215165e16f18a594cc56d741)
@@ -69,5 +69,8 @@
 
 	if (cons_connected && phone2cons != -1) {
-		/* recode to ASCII - one interrupt can produce more than one code so result is stored in fifo */
+		/*
+		 * recode to ASCII - one interrupt can produce more than one
+		 * code so result is stored in fifo
+		 */
 		while (!keybuffer_empty(&keybuffer)) {
 			if (!keybuffer_pop(&keybuffer, (int *)&chr))
@@ -86,9 +89,9 @@
 
 	if (cons_connected) {
-		ipc_answer_fast(iid, ELIMIT, 0, 0);
+		ipc_answer_0(iid, ELIMIT);
 		return;
 	}
 	cons_connected = 1;
-	ipc_answer_fast(iid, 0, 0, 0);
+	ipc_answer_0(iid, EOK);
 
 	while (1) {
@@ -99,5 +102,5 @@
 			ipc_hangup(phone2cons);
 			phone2cons = -1;
-			ipc_answer_fast(callid, 0,0,0);
+			ipc_answer_0(callid, EOK);
 			return;
 		case IPC_M_CONNECT_TO_ME:
@@ -112,5 +115,5 @@
 			retval = EINVAL;
 		}
-		ipc_answer_fast(callid, retval, 0, 0);
+		ipc_answer_0(callid, retval);
 	}	
 }