Changes in uspace/drv/bus/usb/usbmid/main.c [4172db4a:6785b538] in mainline

File:

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

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

@@ -51 +51 @@
 static int usbmid_device_add(usb_device_t *dev)
 {
-        usb_log_info("Taking care of new MID `%s'.", usb_device_get_name(dev));
+        usb_log_info("Taking care of new MID `%s'.\n", usb_device_get_name(dev));
 
         return usbmid_explore_device(dev);
-}
-
-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",
-                            ddf_fun_get_name(iface->fun), str_error(pret));
-                        ret = pret;
-                }
-        }
-
-        return ret;
 }
 
@@ -91 +70 @@
         int ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to unbind USB MID ctl function: %s.",
+                usb_log_error("Failed to unbind USB MID ctl function: %s.\n",
                     str_error(ret));
                 return ret;
@@ -98 +77 @@
 
         /* Remove all children */
-        list_foreach(usb_mid->interface_list, link, usbmid_interface_t, iface) {
-                usb_log_info("Removing child `%s'.",
+        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);
+
+                usb_log_info("Removing child `%s'.\n",
                     ddf_fun_get_name(iface->fun));
 
-                /* Tell the child to go offline. */
+                /* Tell the child to go off-line. */
                 int pret = ddf_fun_offline(iface->fun);
                 if (pret != EOK) {
-                        usb_log_warning("Failed to turn off child `%s': %s",
+                        usb_log_warning("Failed to turn off child `%s': %s\n",
                             ddf_fun_get_name(iface->fun), str_error(pret));
+                        ret = pret;
+                }
+
+                /* Now remove the child. */
+                pret = usbmid_interface_destroy(iface);
+                if (pret != EOK) {
+                        usb_log_error("Failed to destroy child `%s': %s\n",
+                            ddf_fun_get_name(iface->fun), str_error(pret));
+                        ret = pret;
                 }
         }
-
-        return destroy_interfaces(usb_mid);
+        return ret;
 }
 
@@ -124 +116 @@
         assert(usb_mid);
 
-        usb_log_info("USB MID gone: `%s'.", usb_device_get_name(dev));
+        usb_log_info("USB MID gone: `%s'.\n", usb_device_get_name(dev));
 
         /* Remove ctl function */
         int ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to unbind USB MID ctl function: %s.",
+                usb_log_error("Failed to unbind USB MID ctl function: %s.\n",
                     str_error(ret));
                 return ret;
@@ -135 +127 @@
         ddf_fun_destroy(usb_mid->ctl_fun);
 
-        /* Destroy children and tell their drivers they are gone. */
-        return destroy_interfaces(usb_mid);
-}
+        /* Now remove all other functions */
+        while (!list_empty(&usb_mid->interface_list)) {
+                link_t *item = list_first(&usb_mid->interface_list);
+                list_remove(item);
 
-static int usbmid_function_online(ddf_fun_t *fun)
-{
-        usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun));
-        usb_mid_t *usb_mid = usb_device_data_get(usb_dev);
-        if (fun == usb_mid->ctl_fun)
-                return ENOTSUP;
+                usbmid_interface_t *iface = usbmid_interface_from_link(item);
 
-        return ddf_fun_online(fun);
-}
+                usb_log_info("Child `%s' is gone.\n",
+                    ddf_fun_get_name(iface->fun));
 
-static int usbmid_function_offline(ddf_fun_t *fun)
-{
-        usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun));
-        usb_mid_t *usb_mid = usb_device_data_get(usb_dev);
-        if (fun == usb_mid->ctl_fun)
-                return ENOTSUP;
-
-        return ddf_fun_offline(fun);
+                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;
 }
 
@@ -162 +150 @@
 static const usb_driver_ops_t mid_driver_ops = {
         .device_add = usbmid_device_add,
-        .device_remove = usbmid_device_remove,
+        .device_rem = usbmid_device_remove,
         .device_gone = usbmid_device_gone,
-        .function_online = usbmid_function_online,
-        .function_offline = usbmid_function_offline
 };