Changeset e6edc8d1 in mainline for uspace/drv/bus/usb/uhcirh/main.c

Timestamp:

2013-07-11T19:13:37Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

67632f7

Parents:

52ff62d3 (diff), 2b3e8840 (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 with mainline changes.

File:

• uspace/drv/bus/usb/uhcirh/main.c (modified) (1 diff)

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

@@ -93 +93 @@
         size_t io_size = 0;
         uhci_root_hub_t *rh = NULL;
-        int ret = EOK;
+        int rc;
 
-#define CHECK_RET_FREE_RH_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        return ret; \
-} else (void)0
+        rc = hc_get_my_registers(device, &io_regs, &io_size);
+        if (rc != EOK) {
+                usb_log_error( "Failed to get registers from HC: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
 
-        ret = hc_get_my_registers(device, &io_regs, &io_size);
-        CHECK_RET_FREE_RH_RETURN(ret,
-            "Failed to get registers from HC: %s.\n", str_error(ret));
         usb_log_debug("I/O regs at %p (size %zuB).\n",
             (void *) io_regs, io_size);
 
         rh = ddf_dev_data_alloc(device, sizeof(uhci_root_hub_t));
-        ret = (rh == NULL) ? ENOMEM : EOK;
-        CHECK_RET_FREE_RH_RETURN(ret,
-            "Failed to allocate rh driver instance.\n");
+        if (rh == NULL) {
+                usb_log_error("Failed to allocate rh driver instance.\n");
+                return ENOMEM;
+        }
 
-        ret = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
-        CHECK_RET_FREE_RH_RETURN(ret,
-            "Failed(%d) to initialize rh driver instance: %s.\n",
-            ret, str_error(ret));
+        rc = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
+        if (rc != EOK) {
+                usb_log_error("Failed(%d) to initialize rh driver instance: "
+                    "%s.\n", rc, str_error(rc));
+                return rc;
+        }
 
         usb_log_info("Controlling root hub '%s' (%" PRIun ").\n",
             ddf_dev_get_name(device), ddf_dev_get_handle(device));
+
         return EOK;
 }