Changeset bad4a05 in mainline for uspace/lib/usbhost/src

Timestamp:

2018-01-11T04:12:06Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

0892663a

Parents:

a6c4597

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-11 01:31:42)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-11 04:12:06)

Message:

usbhost: made device_remove and endpoint_unregister noexcept

Location:

uspace/lib/usbhost/src

Files:

• bus.c (modified) (2 diffs)
• usb2_bus.c (modified) (2 diffs)

uspace/lib/usbhost/src/bus.c

@@ -112 +112 @@
  * Invoke the device_remove bus operation.
  */
-int bus_device_remove(device_t *dev)
+void bus_device_remove(device_t *dev)
 {
         assert(dev);
 
         const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_remove);
-        if (!ops)
-                return ENOTSUP;
+        assert(ops);
 
         return ops->device_remove(dev);
@@ -266 +265 @@
 
         fibril_mutex_lock(&device->guard);
-        const int r = ops->endpoint_unregister(ep);
-        if (!r)
-                device->endpoints[ep->endpoint] = NULL;
+        ops->endpoint_unregister(ep);
+        device->endpoints[ep->endpoint] = NULL;
         fibril_mutex_unlock(&device->guard);
-
-        if (r)
-                return r;
 
         /* Abort a transfer batch, if there was any */

uspace/lib/usbhost/src/usb2_bus.c

@@ -250 +250 @@
  * Release bandwidth reserved by the given endpoint.
  */
-static int usb2_bus_unregister_ep(endpoint_t *ep)
+static void usb2_bus_unregister_ep(endpoint_t *ep)
 {
         usb2_bus_t *bus = bus_to_usb2_bus(ep->device->bus);
@@ -256 +256 @@
 
         bus->free_bw += ep->bandwidth;
-
-        return EOK;
 }