Changeset 224174f in mainline for uspace/drv/char/ps2mouse/main.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/char/ps2mouse/main.c (modified) (1 diff)

uspace/drv/char/ps2mouse/main.c

@@ -80 +80 @@
 static int mouse_add(ddf_dev_t *device)
 {
+        int rc;
+
         if (!device)
                 return EINVAL;
 
-#define CHECK_RET_RETURN(ret, message...) \
-if (ret != EOK) { \
-        ddf_msg(LVL_ERROR, message); \
-        return ret; \
-} else (void)0
+        ps2_mouse_t *mouse = ddf_dev_data_alloc(device, sizeof(ps2_mouse_t));
+        if (mouse == NULL) {
+                ddf_msg(LVL_ERROR, "Failed to allocate mouse driver instance.");
+                return ENOMEM;
+        }
 
-        ps2_mouse_t *mouse = ddf_dev_data_alloc(device, sizeof(ps2_mouse_t));
-        int ret = (mouse == NULL) ? ENOMEM : EOK;
-        CHECK_RET_RETURN(ret, "Failed to allocate mouse driver instance.");
-
-        ret = ps2_mouse_init(mouse, device);
-        CHECK_RET_RETURN(ret,
-            "Failed to initialize mouse driver: %s.", str_error(ret));
+        rc = ps2_mouse_init(mouse, device);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed to initialize mouse driver: %s.",
+                    str_error(rc));
+                return rc;
+        }
 
         ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",