Changes in uspace/drv/test/test1/test1.c [56fd7cf:9d58539] in mainline

File:

• uspace/drv/test/test1/test1.c (modified) (7 diffs)

uspace/drv/test/test1/test1.c

@@ -145 +145 @@
         ddf_fun_t *fun_a;
         test1_t *test1;
-        const char *dev_name;
-        int rc;
-
-        dev_name = ddf_dev_get_name(dev);
+        int rc;
+
         ddf_msg(LVL_DEBUG, "dev_add(name=\"%s\", handle=%d)",
-            dev_name, (int) ddf_dev_get_handle(dev));
+            dev->name, (int) dev->handle);
 
         test1 = ddf_dev_data_alloc(dev, sizeof(test1_t));
         if (test1 == NULL) {
                 ddf_msg(LVL_ERROR, "Failed allocating soft state.\n");
-                rc = ENOMEM;
-                goto error;
+                return ENOMEM;
         }
 
@@ -162 +159 @@
         if (fun_a == NULL) {
                 ddf_msg(LVL_ERROR, "Failed creating function 'a'.");
-                rc = ENOMEM;
-                goto error;
+                return ENOMEM;
         }
 
@@ -172 +168 @@
                 ddf_msg(LVL_ERROR, "Failed binding function 'a'.");
                 ddf_fun_destroy(fun_a);
-                goto error;
+                return rc;
         }
 
         ddf_fun_add_to_category(fun_a, "virtual");
 
-        if (str_cmp(dev_name, "null") == 0) {
-                ddf_fun_set_ops(fun_a,  &char_device_ops);
+        if (str_cmp(dev->name, "null") == 0) {
+                fun_a->ops = &char_device_ops;
                 ddf_fun_add_to_category(fun_a, "virt-null");
-        } else if (str_cmp(dev_name, "test1") == 0) {
+        } else if (str_cmp(dev->name, "test1") == 0) {
                 (void) register_fun_verbose(dev,
                     "cloning myself ;-)", "clone",
@@ -187 +183 @@
                     "cloning myself twice ;-)", "clone",
                     "virtual&test1", 10, EEXISTS, NULL);
-        } else if (str_cmp(dev_name, "clone") == 0) {
+        } else if (str_cmp(dev->name, "clone") == 0) {
                 (void) register_fun_verbose(dev,
                     "run by the same task", "child",
@@ -193 +189 @@
         }
 
-        ddf_msg(LVL_DEBUG, "Device `%s' accepted.", dev_name);
-        return EOK;
-error:
-        return rc;
+        ddf_msg(LVL_DEBUG, "Device `%s' accepted.", dev->name);
+
+        return EOK;
 }
 
@@ -237 +232 @@
 static int test1_dev_remove(ddf_dev_t *dev)
 {
-        test1_t *test1 = (test1_t *)ddf_dev_data_get(dev);
+        test1_t *test1 = (test1_t *)dev->driver_data;
         int rc;
 
@@ -265 +260 @@
 static int test1_dev_gone(ddf_dev_t *dev)
 {
-        test1_t *test1 = (test1_t *)ddf_dev_data_get(dev);
+        test1_t *test1 = (test1_t *)dev->driver_data;
         int rc;