Changeset c53007f in mainline for uspace/drv/bus/usb/uhcirh

Timestamp:

2013-07-07T11:53:22Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d930980

Parents:

f83666c

Message:

Eliminate CHECK_RETxxx macros from uhci and uhcirh.

Location:

uspace/drv/bus/usb/uhcirh

Files:

• main.c (modified) (1 diff)
• port.c (modified) (3 diffs)

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;
 }

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

@@ -150 +150 @@
 {
         uhci_port_t *instance = port;
+        int rc;
         assert(instance);
 
         unsigned allowed_failures = MAX_ERROR_COUNT;
-#define CHECK_RET_FAIL(ret, msg...) \
-        if (ret != EOK) { \
-                usb_log_error(msg); \
-                if (!(allowed_failures-- > 0)) { \
-                        usb_log_fatal( \
-                           "Maximum number of failures reached, " \
-                           "bailing out.\n"); \
-                        return ret; \
-                } \
-                continue; \
-        } else (void)0
 
         while (1) {
@@ -182 +172 @@
                     instance->id_string, port_status);
 
-                int ret = usb_hc_connection_open(&instance->hc_connection);
-                CHECK_RET_FAIL(ret, "%s: Failed to connect to HC %s.\n",
-                    instance->id_string, str_error(ret));
+                rc = usb_hc_connection_open(&instance->hc_connection);
+                if (rc != EOK) {
+                        usb_log_error("%s: Failed to connect to HC %s.\n",
+                            instance->id_string, str_error(rc));
+                        if (!(allowed_failures-- > 0))
+                                goto fatal_error;
+                        continue;
+                }
 
                 /* Remove any old device */
@@ -204 +199 @@
                 }
 
-                ret = usb_hc_connection_close(&instance->hc_connection);
-                CHECK_RET_FAIL(ret, "%s: Failed to disconnect from hc: %s.\n",
-                    instance->id_string, str_error(ret));
-        }
-        return EOK;
+                rc = usb_hc_connection_close(&instance->hc_connection);
+                if (rc != EOK) {
+                        usb_log_error("%s: Failed to disconnect from HC %s.\n",
+                            instance->id_string, str_error(rc));
+                        if (!(allowed_failures-- > 0))
+                                goto fatal_error;
+                        continue;
+                }
+        }
+
+        return EOK;
+
+fatal_error:
+        usb_log_fatal("Maximum number of failures reached, bailing out.\n");
+        return rc;
 }