Changeset 6843a9c in mainline for uspace/drv/infrastructure/root/root.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/drv/infrastructure/root/root.c (modified) (8 diffs)

uspace/drv/infrastructure/root/root.c

@@ -53 +53 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
-#include <devman.h>
-#include <ipc/devman.h>
 
 #define NAME "root"
@@ -66 +64 @@
 #define VIRTUAL_FUN_MATCH_SCORE 100
 
-static int root_add_device(ddf_dev_t *dev);
+static int root_dev_add(ddf_dev_t *dev);
 static int root_fun_online(ddf_fun_t *fun);
 static int root_fun_offline(ddf_fun_t *fun);
@@ -72 +70 @@
 /** The root device driver's standard operations. */
 static driver_ops_t root_ops = {
-        .add_device = &root_add_device,
+        .dev_add = &root_dev_add,
         .fun_online = &root_fun_online,
         .fun_offline = &root_fun_offline
@@ -158 +156 @@
         if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) {
                 ddf_msg(LVL_ERROR, "Memory allocation failed.");
-                return ENOMEM;
-        }
+                free(platform);
+                return ENOMEM;
+        }
+
+        free(platform);
 
         /* Add function. */
@@ -169 +170 @@
         if (fun == NULL) {
                 ddf_msg(LVL_ERROR, "Error creating function %s", name);
+                free(match_id);
                 return ENOMEM;
         }
@@ -176 +178 @@
                 ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
                     name);
+                free(match_id);
                 ddf_fun_destroy(fun);
                 return rc;
@@ -198 +201 @@
  *                      of HW and pseudo devices).
  */
-static int root_add_device(ddf_dev_t *dev)
-{
-        ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun,
+static int root_dev_add(ddf_dev_t *dev)
+{
+        ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun,
             dev->handle);
 
@@ -208 +211 @@
          * vital for the system.
          */
-        add_virtual_root_fun(dev);
+        (void) add_virtual_root_fun(dev);
 
         /* Register root device's children. */