Index: uspace/lib/c/generic/device/clock_dev.c
===================================================================
--- uspace/lib/c/generic/device/clock_dev.c	(revision f4ebaf3c79c126043b20e90b33796de303a64de1)
+++ uspace/lib/c/generic/device/clock_dev.c	(revision bfc5577aa5ef28b67e83c72e6444478e0a6af8b3)
@@ -49,5 +49,4 @@
 clock_dev_time_get(async_sess_t *sess, struct tm *t)
 {
-	ipc_call_t answer;
 	aid_t req;
 	int ret;
@@ -56,5 +55,5 @@
 
 	req = async_send_1(exch, DEV_IFACE_ID(CLOCK_DEV_IFACE),
-	    CLOCK_DEV_TIME_GET, &answer);
+	    CLOCK_DEV_TIME_GET, NULL);
 	ret = async_data_read_start(exch, t, sizeof(*t));
 
@@ -69,8 +68,5 @@
 
 	async_wait_for(req, &rc);
-	if ((int) rc != EOK)
-		return ret;
-
-	return (int) IPC_GET_ARG1(answer);
+	return (int)rc;
 }
 
@@ -85,5 +81,4 @@
 clock_dev_time_set(async_sess_t *sess, struct tm *t)
 {
-	ipc_call_t answer;
 	aid_t req;
 	int ret;
@@ -92,5 +87,5 @@
 
 	req = async_send_1(exch, DEV_IFACE_ID(CLOCK_DEV_IFACE),
-	    CLOCK_DEV_TIME_SET, &answer);
+	    CLOCK_DEV_TIME_SET, NULL);
 	ret = async_data_write_start(exch, t, sizeof(*t));
 
@@ -105,8 +100,5 @@
 
 	async_wait_for(req, &rc);
-	if ((int) rc != EOK)
-		return ret;
-
-	return (int) IPC_GET_ARG1(answer);
+	return (int)rc;
 }
 
Index: uspace/lib/drv/generic/remote_clock_dev.c
===================================================================
--- uspace/lib/drv/generic/remote_clock_dev.c	(revision f4ebaf3c79c126043b20e90b33796de303a64de1)
+++ uspace/lib/drv/generic/remote_clock_dev.c	(revision bfc5577aa5ef28b67e83c72e6444478e0a6af8b3)
@@ -96,9 +96,10 @@
 		async_data_read_finalize(cid, NULL, 0);
 		async_answer_0(callid, rc);
+		return;
 	}
 
 	/* The operation was successful */
 	async_data_read_finalize(cid, &t, sizeof(struct tm));
-	async_answer_1(callid, EOK, rc);
+	async_answer_0(callid, rc);
 }
 
@@ -133,11 +134,6 @@
 
 	rc = (*clock_dev_ops->time_set)(fun, &t);
-	if (rc < 0) {
-		/* Some error occurred */
-		async_answer_0(callid, rc);
-		return;
-	}
 
-	async_answer_1(callid, EOK, rc);
+	async_answer_0(callid, rc);
 }