Changeset bad4a05 in mainline for uspace/drv/bus/usb/xhci/bus.c

Timestamp:

2018-01-11T04:12:06Z (7 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

File:

• uspace/drv/bus/usb/xhci/bus.c (modified) (6 diffs)

uspace/drv/bus/usb/xhci/bus.c

@@ -193 +193 @@
 }
 
-static int endpoint_unregister(endpoint_t *);
-
 /**
  * Remove device from XHCI bus. Transition it to the offline state, abort all
@@ -205 +203 @@
  * @return Error code.
  */
-static int device_remove(device_t *dev)
+static void device_remove(device_t *dev)
 {
         int err;
@@ -249 +247 @@
                         continue;
 
-                if ((err = endpoint_unregister(dev->endpoints[i]))) {
-                        usb_log_warning("Failed to unregister endpoint " XHCI_EP_FMT ": %s",
-                            XHCI_EP_ARGS(*xhci_device_get_endpoint(xhci_dev, i)), str_error(err));
-                }
+                bus_endpoint_remove(dev->endpoints[i]);
         }
 
@@ -258 +253 @@
         /* XXX: Not a good idea, this method should not destroy devices. */
         hcd_ddf_fun_destroy(dev);
-
-        return EOK;
 }
 
@@ -415 +408 @@
  * Bus callback.
  */
-static int endpoint_unregister(endpoint_t *ep_base)
+static void endpoint_unregister(endpoint_t *ep_base)
 {
         int err;
@@ -433 +426 @@
                     " the slot has already been disabled.", XHCI_EP_ARGS(*ep));
         }
-
-        return EOK;
 }