Changeset 91173333 in mainline for uspace/drv/bus/usb/usbmid/main.c

Timestamp:

2018-01-13T21:36:13Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

edc51615

Parents:

8a0c52a

Message:

usbdev: use centralized joining mechanism, move away from device_removed() callback

File:

• uspace/drv/bus/usb/usbmid/main.c (modified) (3 diffs)

uspace/drv/bus/usb/usbmid/main.c

@@ -56 +56 @@
 }
 
+static int destroy_interfaces(usb_mid_t *usb_mid)
+{
+        int ret = EOK;
+
+        while (!list_empty(&usb_mid->interface_list)) {
+                link_t *item = list_first(&usb_mid->interface_list);
+                list_remove(item);
+
+                usbmid_interface_t *iface = usbmid_interface_from_link(item);
+
+                const int pret = usbmid_interface_destroy(iface);
+                if (pret != EOK) {
+                        usb_log_error("Failed to remove child `%s': %s\n",
+                            ddf_fun_get_name(iface->fun), str_error(pret));
+                        ret = pret;
+                }
+        }
+
+        return ret;
+}
+
 /** Callback when a MID device is about to be removed from the host.
  *
@@ -90 +111 @@
         }
 
-        return ret;
-}
-
-static int destroy_interfaces(usb_mid_t *usb_mid)
-{
-        int ret = EOK;
-
-        while (!list_empty(&usb_mid->interface_list)) {
-                link_t *item = list_first(&usb_mid->interface_list);
-                list_remove(item);
-
-                usbmid_interface_t *iface = usbmid_interface_from_link(item);
-
-                const int pret = usbmid_interface_destroy(iface);
-                if (pret != EOK) {
-                        usb_log_error("Failed to remove child `%s': %s\n",
-                            ddf_fun_get_name(iface->fun), str_error(pret));
-                        ret = pret;
-                }
-        }
-
-        return ret;
-}
-
-static int usbmid_device_removed(usb_device_t *dev)
-{
-        assert(dev);
-        usb_mid_t *usb_mid = usb_device_data_get(dev);
-        assert(usb_mid);
-
-        /* Children are offline. Destroy them now. */
         return destroy_interfaces(usb_mid);
 }
@@ -166 +156 @@
         .device_add = usbmid_device_add,
         .device_remove = usbmid_device_remove,
-        .device_removed = usbmid_device_removed,
         .device_gone = usbmid_device_gone,
         .function_online = usbmid_function_online,