Changes in kernel/generic/src/ipc/ops/conctmeto.c [b7fd2a0:48bcf49] in mainline

File:

• kernel/generic/src/ipc/ops/conctmeto.c (modified) (4 diffs)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -40 +40 @@
 #include <arch.h>
 
-static errno_t request_preprocess(call_t *call, phone_t *phone)
+static int request_preprocess(call_t *call, phone_t *phone)
 {
-        cap_handle_t phone_handle;
-        errno_t rc = phone_alloc(TASK, &phone_handle);
+        cap_handle_t phone_handle = phone_alloc(TASK);
 
-        /* Remember the phone capability or that an error occured. */
-        call->priv = (rc == EOK) ? phone_handle : -1;
-
-        if (rc != EOK) {
-                return rc;
-        }
+        /* Remember the phone capability or the error. */
+        call->priv = phone_handle;
+        if (phone_handle < 0)
+                return phone_handle;
 
         /* Set arg5 for server */
@@ -61 +58 @@
 }
 
-static errno_t request_forget(call_t *call)
+static int request_forget(call_t *call)
 {
         cap_handle_t phone_handle = (cap_handle_t) call->priv;
-
-        if (phone_handle < 0) {
-                return EOK;
-        }
-
         phone_dealloc(phone_handle);
         /* Hand over reference from ARG5 to phone->kobject */
@@ -77 +69 @@
 }
 
-static errno_t answer_preprocess(call_t *answer, ipc_data_t *olddata)
+static int answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
         /* Hand over reference from ARG5 to phone */
@@ -93 +85 @@
 }
 
-static errno_t answer_process(call_t *answer)
+static int answer_process(call_t *answer)
 {
         cap_handle_t phone_handle = (cap_handle_t) answer->priv;