Changeset 8436590 in mainline for uspace/drv/root/root.c

Timestamp:

2011-04-07T21:38:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (diff), ccca251 (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/root/root.c (modified) (11 diffs)

uspace/drv/root/root.c

@@ -91 +91 @@
 
         ddf_msg(LVL_DEBUG, "Adding new function for virtual devices. "
-            "Function node is `%s' (%d %s)\n", name,
+            "Function node is `%s' (%d %s)", name,
             VIRTUAL_FUN_MATCH_SCORE, VIRTUAL_FUN_MATCH_ID);
 
         fun = ddf_fun_create(dev, fun_inner, name);
         if (fun == NULL) {
-                ddf_msg(LVL_ERROR, "Failed creating function %s\n", name);
+                ddf_msg(LVL_ERROR, "Failed creating function %s", name);
                 return ENOMEM;
         }
@@ -103 +103 @@
             VIRTUAL_FUN_MATCH_SCORE);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s\n", name);
+                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
+                    name);
                 ddf_fun_destroy(fun);
                 return rc;
@@ -110 +111 @@
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function %s: %s\n", name,
+                ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name,
                     str_error(rc));
                 ddf_fun_destroy(fun);
@@ -137 +138 @@
         platform = sysinfo_get_data("platform", &platform_size);
         if (platform == NULL) {
-                ddf_msg(LVL_ERROR, "Failed to obtain platform name.\n");
+                ddf_msg(LVL_ERROR, "Failed to obtain platform name.");
                 return ENOENT;
         }
@@ -144 +145 @@
         platform = realloc(platform, platform_size + 1);
         if (platform == NULL) {
-                ddf_msg(LVL_ERROR, "Memory allocation failed.\n");
+                ddf_msg(LVL_ERROR, "Memory allocation failed.");
                 return ENOMEM;
         }
@@ -152 +153 @@
         /* Construct match ID. */
         if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) {
-                ddf_msg(LVL_ERROR, "Memory allocation failed.\n");
+                ddf_msg(LVL_ERROR, "Memory allocation failed.");
                 return ENOMEM;
         }
@@ -158 +159 @@
         /* Add function. */
         ddf_msg(LVL_DEBUG, "Adding platform function. Function node is `%s' "
-            " (%d %s)\n", PLATFORM_FUN_NAME, PLATFORM_FUN_MATCH_SCORE,
+            " (%d %s)", PLATFORM_FUN_NAME, PLATFORM_FUN_MATCH_SCORE,
             match_id);
 
         fun = ddf_fun_create(dev, fun_inner, name);
         if (fun == NULL) {
-                ddf_msg(LVL_ERROR, "Error creating function %s\n", name);
+                ddf_msg(LVL_ERROR, "Error creating function %s", name);
                 return ENOMEM;
         }
@@ -169 +170 @@
         rc = ddf_fun_add_match_id(fun, match_id, PLATFORM_FUN_MATCH_SCORE);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s\n",
+                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
                     name);
                 ddf_fun_destroy(fun);
@@ -177 +178 @@
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function %s: %s\n", name,
+                ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name,
                     str_error(rc));
                 ddf_fun_destroy(fun);
@@ -193 +194 @@
 static int root_add_device(ddf_dev_t *dev)
 {
-        ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun "\n",
+        ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun,
             dev->handle);
 
@@ -206 +207 @@
         int res = add_platform_fun(dev);
         if (EOK != res)
-                ddf_msg(LVL_ERROR, "Failed adding child device for platform.\n");
+                ddf_msg(LVL_ERROR, "Failed adding child device for platform.");
 
         return res;