Changes in uspace/drv/infrastructure/rootvirt/rootvirt.c [deac215e:5203e256] in mainline

File:

• uspace/drv/infrastructure/rootvirt/rootvirt.c (modified) (6 diffs)

uspace/drv/infrastructure/rootvirt/rootvirt.c

@@ -63 +63 @@
 
 static int rootvirt_add_device(ddf_dev_t *dev);
-static int rootvirt_dev_remove(ddf_dev_t *dev);
-static int rootvirt_fun_online(ddf_fun_t *fun);
-static int rootvirt_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t rootvirt_ops = {
-        .add_device = &rootvirt_add_device,
-        .dev_remove = &rootvirt_dev_remove,
-        .fun_online = &rootvirt_fun_online,
-        .fun_offline = &rootvirt_fun_offline
+        .add_device = &rootvirt_add_device
 };
 
@@ -79 +73 @@
 };
 
-/* Device soft state */
-typedef struct {
-        ddf_dev_t *dev;
-        list_t functions;
-} rootvirt_t;
-
-/* Function soft state */
-typedef struct {
-        ddf_fun_t *fun;
-        link_t dev_link;
-} rootvirt_fun_t;
-
-static int instances = 0;
-
-
 /** Add function to the virtual device.
  *
@@ -100 +79 @@
  * @return              EOK on success or negative error code.
  */
-static int rootvirt_add_fun(rootvirt_t *rootvirt, virtual_function_t *vfun)
+static int rootvirt_add_fun(ddf_dev_t *vdev, virtual_function_t *vfun)
 {
-        ddf_dev_t *vdev = rootvirt->dev;
         ddf_fun_t *fun;
-        rootvirt_fun_t *rvfun;
         int rc;
 
@@ -115 +92 @@
                 return ENOMEM;
         }
-
-        rvfun = ddf_fun_data_alloc(fun, sizeof(rootvirt_fun_t));
-        if (rvfun == NULL) {
-                ddf_msg(LVL_ERROR, "Failed allocating soft state for %s.",
-                    vfun->name);
-                ddf_fun_destroy(fun);
-                return ENOMEM;
-        }
-
-        rvfun->fun = fun;
 
         rc = ddf_fun_add_match_id(fun, vfun->match_id, 10);
@@ -142 +109 @@
         }
 
-        list_append(&rvfun->dev_link, &rootvirt->functions);
-
         ddf_msg(LVL_NOTE, "Registered child device `%s'", vfun->name);
         return EOK;
 }
 
-static int rootvirt_fun_remove(rootvirt_fun_t *rvfun)
-{
-        int rc;
-        const char *name = rvfun->fun->name;
-
-        ddf_msg(LVL_DEBUG, "rootvirt_fun_remove('%s')", name);
-        rc = ddf_fun_offline(rvfun->fun);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Error offlining function '%s'.", name);
-                return rc;
-        }
-
-        rc = ddf_fun_unbind(rvfun->fun);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed unbinding function '%s'.", name);
-                return rc;
-        }
-
-        list_remove(&rvfun->dev_link);
-        ddf_fun_destroy(rvfun->fun);
-        return EOK;
-}
-
-
 static int rootvirt_add_device(ddf_dev_t *dev)
 {
-        rootvirt_t *rootvirt;
+        static int instances = 0;
 
         /*
          * Allow only single instance of root virtual device.
          */
-        if (++instances > 1) {
+        instances++;
+        if (instances > 1) {
                 return ELIMIT;
         }
 
         ddf_msg(LVL_DEBUG, "add_device(handle=%d)", (int)dev->handle);
-
-        rootvirt = ddf_dev_data_alloc(dev, sizeof(rootvirt_t));
-        if (rootvirt == NULL)
-                return ENOMEM;
-
-        rootvirt->dev = dev;
-        list_initialize(&rootvirt->functions);
 
         /*
@@ -198 +133 @@
         virtual_function_t *vfun = virtual_functions;
         while (vfun->name != NULL) {
-                (void) rootvirt_add_fun(rootvirt, vfun);
+                (void) rootvirt_add_fun(dev, vfun);
                 vfun++;
         }
 
         return EOK;
-}
-
-static int rootvirt_dev_remove(ddf_dev_t *dev)
-{
-        rootvirt_t *rootvirt = (rootvirt_t *)dev->driver_data;
-        int rc;
-
-        while (!list_empty(&rootvirt->functions)) {
-                rootvirt_fun_t *rvfun = list_get_instance(
-                    list_first(&rootvirt->functions), rootvirt_fun_t,
-                        dev_link);
-
-                rc = rootvirt_fun_remove(rvfun);
-                if (rc != EOK)
-                        return rc;
-        }
-
-        --instances;
-        return EOK;
-}
-
-static int rootvirt_fun_online(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "rootvirt_fun_online()");
-        return ddf_fun_online(fun);
-}
-
-static int rootvirt_fun_offline(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "rootvirt_fun_offline()");
-        return ddf_fun_offline(fun);
 }