Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbflbk/main.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/usbflbk/main.c (modified) (2 diffs)

uspace/drv/bus/usb/usbflbk/main.c

@@ -48 +48 @@
 static int usbfallback_device_add(usb_device_t *dev)
 {
-        int rc;
-        const char *fun_name = "ctl";
-
-        ddf_fun_t *ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed,
-            fun_name);
-        if (ctl_fun == NULL) {
-                usb_log_error("Failed to create control function.\n");
-                return ENOMEM;
-        }
-        rc = ddf_fun_bind(ctl_fun);
-        if (rc != EOK) {
-                usb_log_error("Failed to bind control function: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-
-        dev->driver_data = ctl_fun;
-
-        usb_log_info("Pretending to control %s `%s'" \
-            " (node `%s', handle %" PRIun ").\n",
-            dev->interface_no < 0 ? "device" : "interface",
-            ddf_dev_get_name(dev->ddf_dev), fun_name, ddf_dev_get_handle(dev->ddf_dev));
-
+        usb_log_info("Pretending to control %s `%s'.\n",
+            usb_device_get_iface_number(dev) < 0 ? "device" : "interface",
+            usb_device_get_name(dev));
         return EOK;
 }
@@ -82 +62 @@
 {
         assert(dev);
-        ddf_fun_t *ctl_fun = dev->driver_data;
-        const int ret = ddf_fun_unbind(ctl_fun);
-        if (ret != EOK) {
-                usb_log_error("Failed to unbind %s.\n", ddf_fun_get_name(ctl_fun));
-                return ret;
-        }
-        ddf_fun_destroy(ctl_fun);
-        dev->driver_data = NULL;
-
         return EOK;
 }