Changes in uspace/lib/usb/src/hcdhubd.c [1f43c8f:fe5e00d6] in mainline

File:

• uspace/lib/usb/src/hcdhubd.c (modified) (6 diffs)

uspace/lib/usb/src/hcdhubd.c

@@ -40 +40 @@
 #include <bool.h>
 #include <errno.h>
-#include <str_error.h>
 #include <usb/classes/hub.h>
 
@@ -113 +112 @@
         }
 
-        rc = usb_hc_add_child_device(dev->generic, USB_HUB_DEVICE_NAME, id, true);
+        rc = usb_hc_add_child_device(dev->generic, USB_HUB_DEVICE_NAME, id);
         if (rc != EOK) {
                 free(id);
@@ -151 +150 @@
         match_id->id = child_info->match_id;
         match_id->score = 10;
+        printf("adding child device with match \"%s\"\n", match_id->id);
         add_match_id(&child->match_ids, match_id);
 
-        printf("%s: adding child device `%s' with match \"%s\"\n",
-            hc_driver->name, child->name, match_id->id);
         rc = child_device_register(child, child_info->parent);
-        printf("%s: child device `%s' registration: %s\n",
-            hc_driver->name, child->name, str_error(rc));
-
         if (rc != EOK) {
                 goto failure;
@@ -178 +173 @@
 leave:
         free(arg);
-        return EOK;
+        return rc;
 }
 
@@ -185 +180 @@
  * driven by the same task, the child adding is done in separate fibril.
  * Not optimal, but it works.
- * Update: not under all circumstances the new fibril is successful either.
- * Thus the last parameter to let the caller choose.
  *
  * @param parent Parent device.
  * @param name Device name.
  * @param match_id Match id.
- * @param create_fibril Whether to run the addition in new fibril.
  * @return Error code.
  */
 int usb_hc_add_child_device(device_t *parent, const char *name,
-    const char *match_id, bool create_fibril)
-{
-        printf("%s: about to add child device `%s' (%s)\n", hc_driver->name,
-            name, match_id);
-
+    const char *match_id)
+{
         struct child_device_info *child_info
             = malloc(sizeof(struct child_device_info));
@@ -207 +196 @@
         child_info->match_id = match_id;
 
-        if (create_fibril) {
-                fid_t fibril = fibril_create(fibril_add_child_device, child_info);
-                if (!fibril) {
-                        return ENOMEM;
-                }
-                fibril_add_ready(fibril);
-        } else {
-                fibril_add_child_device(child_info);
-        }
+        fid_t fibril = fibril_create(fibril_add_child_device, child_info);
+        if (!fibril) {
+                return ENOMEM;
+        }
+        fibril_add_ready(fibril);
 
         return EOK;