Changeset bad4a05 in mainline for uspace/drv

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/drv/bus/usb

Files:

• ehci/ehci_bus.c (modified) (2 diffs)
• ohci/ohci_bus.c (modified) (1 diff)
• xhci/bus.c (modified) (6 diffs)
• xhci/rh.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -113 +113 @@
 }
 
-static int ehci_unregister_ep(endpoint_t *ep)
+static void ehci_unregister_ep(endpoint_t *ep)
 {
         bus_t *bus_base = endpoint_get_bus(ep);
@@ -120 +120 @@
         assert(ep);
 
-        const int err = usb2_bus_ops.endpoint_unregister(ep);
-        if (err)
-                return err;
-
+        usb2_bus_ops.endpoint_unregister(ep);
         hc_dequeue_endpoint(bus->hc, ep);
-        return EOK;
 }
 

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -118 +118 @@
 }
 
-static int ohci_unregister_ep(endpoint_t *ep)
+static void ohci_unregister_ep(endpoint_t *ep)
 {
         ohci_bus_t *bus = (ohci_bus_t *) endpoint_get_bus(ep);
         assert(ep);
 
-        const int err = usb2_bus_ops.endpoint_unregister(ep);
-        if (err)
-                return err;
-
+        usb2_bus_ops.endpoint_unregister(ep);
         hc_dequeue_endpoint(bus->hc, ep);
-        return EOK;
 }
 

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;
 }
 

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

@@ -188 +188 @@
 {
         assert(rh);
-        int err;
 
         /* Find XHCI device by the port. */
@@ -207 +206 @@
 
         /* Remove device from XHCI bus. */
-        if ((err = bus_device_remove(&dev->base))) {
-                usb_log_warning("Failed to remove device " XHCI_DEV_FMT " from XHCI bus: %s",
-                    XHCI_DEV_ARGS(*dev), str_error(err));
-        }
+        bus_device_remove(&dev->base);
 
         return EOK;