Changeset 408d3c9 in mainline

Timestamp:

2011-07-12T18:56:56Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9d4c1b6

Parents:

26858040

Message:

UHCI: Remove error number from messages.

Location:

uspace/drv/bus/usb/uhci

Files:

• root_hub.c (modified) (2 diffs)
• uhci.c (modified) (3 diffs)

uspace/drv/bus/usb/uhci/root_hub.c

@@ -55 +55 @@
         int ret = asprintf(&match_str, "usb&uhci&root-hub");
         if (ret < 0) {
-                usb_log_error(
-                    "Failed(%d) to create root hub match string: %s.\n",
-                    ret, str_error(ret));
+                usb_log_error("Failed to create root hub match string: %s.\n",
+                    str_error(ret));
                 return ret;
         }
@@ -65 +64 @@
         if (ret != EOK) {
                 free(match_str);
-                usb_log_error("Failed(%d) to add root hub match id: %s\n",
-                    ret, str_error(ret));
+                usb_log_error("Failed to add root hub match id: %s\n",
+                    str_error(ret));
                 return ret;
         }

uspace/drv/bus/usb/uhci/uhci.c

@@ -253 +253 @@
         ret = hc_init(&instance->hc, (void*)reg_base, reg_size, interrupts);
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed(%d) to init uhci_hcd: %s.\n", ret, str_error(ret));
+            "Failed to init uhci_hcd: %s.\n", str_error(ret));
 
         device->driver_data = instance;
@@ -265 +265 @@
 
         ret = ddf_fun_bind(instance->hc_fun);
-        CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to bind UHCI device function: %s.\n",
-            ret, str_error(ret));
+        CHECK_RET_FINI_RETURN(ret, "Failed to bind UHCI device function: %s.\n",
+            str_error(ret));
 
         ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
@@ -276 +275 @@
             (uintptr_t)instance->hc.registers + 0x10, 4);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to setup UHCI root hub: %s.\n", ret, str_error(ret));
+            "Failed to setup UHCI root hub: %s.\n", str_error(ret));
 
         ret = ddf_fun_bind(instance->rh_fun);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to register UHCI root hub: %s.\n", ret, str_error(ret));
+            "Failed to register UHCI root hub: %s.\n", str_error(ret));
 
         return EOK;