Changeset 224174f in mainline for uspace/drv/bus/usb/uhcirh/port.c

Timestamp:

2013-07-11T13:16:57Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

2b3e8840, b2c96093

Parents:

990ab7d (diff), 3a67d63 (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/uhcirh/port.c (modified) (3 diffs)

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