Changeset 00aece0 in mainline for uspace/drv/bus/usb/uhci/main.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/bus/usb/uhci/main.c (modified) (2 diffs)

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

@@ -43 +43 @@
 #define NAME "uhci"
 
-static int uhci_add_device(ddf_dev_t *device);
+static int uhci_dev_add(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
 static driver_ops_t uhci_driver_ops = {
-        .add_device = uhci_add_device,
+        .dev_add = uhci_dev_add,
 };
 /*----------------------------------------------------------------------------*/
@@ -59 +59 @@
  * @return Error code.
  */
-int uhci_add_device(ddf_dev_t *device)
+int uhci_dev_add(ddf_dev_t *device)
 {
-        usb_log_debug2("uhci_add_device() called\n");
+        usb_log_debug2("uhci_dev_add() called\n");
         assert(device);
 
-        int ret = device_setup_uhci(device);
+        const int ret = device_setup_uhci(device);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize UHCI driver: %s.\n",
                     str_error(ret));
-                return ret;
+        } else {
+                usb_log_info("Controlling new UHCI device '%s'.\n",
+                    device->name);
         }
-        usb_log_info("Controlling new UHCI device '%s'.\n", device->name);
 
-        return EOK;
+        return ret;
 }
 /*----------------------------------------------------------------------------*/