Changeset 6340a6ff in mainline

Timestamp:

2013-08-07T08:50:54Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

cb8ede1

Parents:

e0d8b740

Message:

ohci: some more macro removal

File:

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

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

@@ -147 +147 @@
         assert(instance);
 
-#define CHECK_RET_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        return ret; \
-} else (void)0
-
         int ret =
             pio_enable((void*)regs, reg_size, (void**)&instance->registers);
-        CHECK_RET_RETURN(ret,
-            "Failed to gain access to device registers: %s.\n", str_error(ret));
+        if (ret != EOK) {
+                usb_log_error("Failed to enable access to device regss: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
 
         list_initialize(&instance->pending_batches);
+        fibril_mutex_initialize(&instance->guard);
 
         ret = hc_init_memory(instance);
-        CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
-            str_error(ret));
-#undef CHECK_RET_RETURN
-
-        fibril_mutex_initialize(&instance->guard);
+        if (ret != EOK) {
+                usb_log_error("Failed to create OHCI memory structures: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
 
         hc_gain_control(instance);
@@ -501 +499 @@
 do { \
         const char *name = usb_str_transfer_type(type); \
-        int ret = endpoint_list_init(&instance->lists[type], name); \
+        const int ret = endpoint_list_init(&instance->lists[type], name); \
         if (ret != EOK) { \
                 usb_log_error("Failed to setup %s endpoint list: %s.\n", \