Changeset 622e7c9 in mainline

Timestamp:

2020-05-05T16:15:09Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ccbd2e1

Parents:

698ce34c

Message:

async_hangup() should just always succeed

There is no reason why this should fail in a valid program. If you e.g.
hang up the phone manually and then call async_hangup(), your bad.
We are washing our hands.

Location:

uspace

Files:

• drv/hid/usbhid/mouse/mousedev.c (modified) (1 diff)
• lib/c/generic/async/client.c (modified) (4 diffs)
• lib/c/include/async.h (modified) (1 diff)

uspace/drv/hid/usbhid/mouse/mousedev.c

@@ -422 +422 @@
 
         /* Hangup session to the console */
-        if (mouse_dev->mouse_sess != NULL) {
-                const errno_t ret = async_hangup(mouse_dev->mouse_sess);
-                if (ret != EOK)
-                        usb_log_warning("Failed to hang up mouse session: "
-                            "%p, %s.\n", mouse_dev->mouse_sess, str_error(ret));
-        }
+        if (mouse_dev->mouse_sess != NULL)
+                async_hangup(mouse_dev->mouse_sess);
 
         free(mouse_dev->buttons);

uspace/lib/c/generic/async/client.c

@@ -1050 +1050 @@
 }
 
-static errno_t async_hangup_internal(cap_phone_handle_t phone)
-{
-        return ipc_hangup(phone);
+static void async_hangup_internal(cap_phone_handle_t phone)
+{
+        (void) ipc_hangup(phone);
 }
 
@@ -1058 +1058 @@
  *
  * @param sess Session to hung up.
- *
- * @return Zero on success or an error code.
- *
- */
-errno_t async_hangup(async_sess_t *sess)
+ */
+void async_hangup(async_sess_t *sess)
 {
         async_exch_t *exch;
@@ -1071 +1068 @@
         assert(sess->exchanges == 0);
 
-        errno_t rc = async_hangup_internal(sess->phone);
+        async_hangup_internal(sess->phone);
 
         while (!list_empty(&sess->exch_list)) {
@@ -1087 +1084 @@
 
         fibril_mutex_unlock(&async_sess_mutex);
-
-        return rc;
 }
 

uspace/lib/c/include/async.h

@@ -282 +282 @@
 extern errno_t async_connect_to_me(async_exch_t *, iface_t, sysarg_t, sysarg_t);
 
-extern errno_t async_hangup(async_sess_t *);
+extern void async_hangup(async_sess_t *);
 
 extern async_exch_t *async_exchange_begin(async_sess_t *);