Changeset e618885 in mainline

Timestamp:

2018-03-13T18:01:47Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ca61894

Parents:

70327bb

git-author:

Jakub Jermar <jakub@…> (2018-03-04 11:56:50)

git-committer:

Jakub Jermar <jakub@…> (2018-03-13 18:01:47)

Message:

Remove dead code

The phone_cap_wait_cb was never called as all phone capabilities are
already destroyed at this point.

File:

• kernel/generic/src/ipc/ipc.c (modified) (1 diff)

kernel/generic/src/ipc/ipc.c

@@ -753 +753 @@
 }
 
-static bool phone_cap_wait_cb(cap_t *cap, void *arg)
-{
-        phone_t *phone = cap->kobject->phone;
-        bool *restart = (bool *) arg;
-
-        mutex_lock(&phone->lock);
-
-        /*
-         * We might have had some IPC_PHONE_CONNECTING phones at the beginning
-         * of ipc_cleanup(). Depending on whether these were forgotten or
-         * answered, they will eventually enter the IPC_PHONE_FREE or
-         * IPC_PHONE_CONNECTED states, respectively.  In the latter case, the
-         * other side may slam the open phones at any time, in which case we
-         * will get an IPC_PHONE_SLAMMED phone.
-         */
-        if ((phone->state == IPC_PHONE_CONNECTED) ||
-            (phone->state == IPC_PHONE_SLAMMED)) {
-                mutex_unlock(&phone->lock);
-                ipc_phone_hangup(phone);
-                /*
-                 * Now there may be one extra active call, which needs to be
-                 * forgotten.
-                 */
-                ipc_forget_all_active_calls();
-                *restart = true;
-                return false;
-        }
-
-        /*
-         * If the hangup succeeded, it has sent a HANGUP message, the IPC is now
-         * in HUNGUP state, we wait for the reply to come
-         */
-        if (phone->state != IPC_PHONE_FREE) {
-                mutex_unlock(&phone->lock);
-                return false;
-        }
-
-        mutex_unlock(&phone->lock);
-        return true;
-}
-
 /** Wait for all answers to asynchronous calls to arrive. */
 static void ipc_wait_for_all_answered_calls(void)
 {
         call_t *call;
-        bool restart;
 
 restart:
-        /*
-         * Go through all phones, until they are all free.
-         */
-        restart = false;
-        if (caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_PHONE,
-            phone_cap_wait_cb, &restart) &&
-            atomic_get(&TASK->answerbox.active_calls) == 0) {
+        if (atomic_get(&TASK->answerbox.active_calls) == 0) {
                 /* Got into cleanup */
                 return;
         }
-        if (restart)
-                goto restart;
 
         call = ipc_wait_for_call(&TASK->answerbox, SYNCH_NO_TIMEOUT,