Changeset a4e18e1 in mainline for uspace/drv/uhci-rhd/root_hub.c

Timestamp:

2011-04-07T15:04:16Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

36cd378

Parents:

9d06563 (diff), a82889e (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:

partial merge form usb/development

File:

• uspace/drv/uhci-rhd/root_hub.c (modified) (3 diffs)

uspace/drv/uhci-rhd/root_hub.c

@@ -51 +51 @@
         assert(instance);
         assert(rh);
-        int ret;
 
         /* Allow access to root hub port registers */
         assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT <= size);
         port_status_t *regs;
-        ret = pio_enable(addr, size, (void**)&regs);
+        int ret = pio_enable(addr, size, (void**)&regs);
         if (ret < 0) {
                 usb_log_error(
@@ -84 +83 @@
  *
  * @param[in] instance Root hub structure to use.
- * @return Error code.
  */
-int uhci_root_hub_fini(uhci_root_hub_t* instance)
+void uhci_root_hub_fini(uhci_root_hub_t* instance)
 {
         assert(instance);
@@ -93 +91 @@
                 uhci_port_fini(&instance->ports[i]);
         }
-        return EOK;
 }
 /*----------------------------------------------------------------------------*/