Changeset 4d62aa0 in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2011-07-10T23:03:54Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1ef93fa

Parents:

78ab6d4

Message:

OHCI: Cleanup error messages. Set driver data sooner.

File:

• uspace/drv/bus/usb/ohci/ohci.c (modified) (8 diffs)

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

@@ -167 +167 @@
         } \
         free(instance); \
+        device->driver_data = NULL; \
         usb_log_error(message); \
         return ret; \
@@ -174 +175 @@
         instance->hc_fun = ddf_fun_create(device, fun_exposed, "ohci_hc");
         int ret = instance->hc_fun ? EOK : ENOMEM;
-        CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create OHCI HC function.\n");
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to create OHCI HC function: %s.\n", str_error(ret));
         instance->hc_fun->ops = &hc_ops;
         instance->hc_fun->driver_data = &instance->hc;
@@ -180 +182 @@
         instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci_rh");
         ret = instance->rh_fun ? EOK : ENOMEM;
-        CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create OHCI RH function.\n");
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to create OHCI RH function: %s.\n", str_error(ret));
         instance->rh_fun->ops = &rh_ops;
 
@@ -207 +210 @@
             &irq_code);
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed(%d) to register interrupt handler.\n", ret);
+            "Failed to register interrupt handler: %s.\n", str_error(ret));
 
         /* Try to enable interrupts */
@@ -214 +217 @@
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."
-                    "Falling back to pollling\n", str_error(ret));
+                    "Falling back to polling\n", str_error(ret));
                 /* We don't need that handler */
                 unregister_interrupt_handler(device, irq);
@@ -223 +226 @@
 
         ret = hc_init(&instance->hc, reg_base, reg_size, interrupts);
-        CHECK_RET_DEST_FREE_RETURN(ret, "Failed(%d) to init ohci_hcd.\n", ret);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to init ohci_hcd: %s.\n", str_error(ret));
+
+        device->driver_data = instance;
 
 #define CHECK_RET_FINI_RETURN(ret, message...) \
@@ -235 +241 @@
         ret = ddf_fun_bind(instance->hc_fun);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to bind OHCI device function: %s.\n",
-            ret, str_error(ret));
+            "Failed to bind OHCI device function: %s.\n", str_error(ret));
 
         ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
@@ -242 +247 @@
             "Failed to add OHCI to HC class: %s.\n", str_error(ret));
 
-        device->driver_data = instance;
-
         hc_start_hw(&instance->hc);
         hc_register_hub(&instance->hc, instance->rh_fun);