Changes in uspace/drv/char/xtkbd/main.c [e882e3a:b2010e2] in mainline

File:

• uspace/drv/char/xtkbd/main.c (modified) (2 diffs)

uspace/drv/char/xtkbd/main.c

@@ -69 +69 @@
 {
         printf(NAME ": HelenOS XT keyboard driver.\n");
-        ddf_log_init(NAME, LVL_NOTE);
+        ddf_log_init(NAME);
         return ddf_driver_main(&kbd_driver);
 }
@@ -80 +80 @@
 static int xt_kbd_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
+        xt_kbd_t *kbd = ddf_dev_data_alloc(device, sizeof(xt_kbd_t));
+        if (kbd == NULL) {
+                ddf_msg(LVL_ERROR, "Failed to allocate XT/KBD driver instance.");
+                return ENOMEM;
+        }
 
-        xt_kbd_t *kbd = ddf_dev_data_alloc(device, sizeof(xt_kbd_t));
-        int ret = (kbd == NULL) ? ENOMEM : EOK;
-        CHECK_RET_RETURN(ret, "Failed to allocate XT/KBD driver instance.");
-
-        ret = xt_kbd_init(kbd, device);
-        CHECK_RET_RETURN(ret,
-            "Failed to initialize XT_KBD driver: %s.", str_error(ret));
+        rc = xt_kbd_init(kbd, device);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed to initialize XT_KBD driver: %s.",
+                    str_error(rc));
+                return rc;
+        }
 
         ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",
-            device->name, device->handle);
+            ddf_dev_get_name(device), ddf_dev_get_handle(device));
         return EOK;
 }