Changeset d93f5afb in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2013-08-02T15:59:51Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

dcbda00

Parents:

3969a42

Message:

libusbdev: Cleanup unused code.

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (6 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -111 +111 @@
         fibril_condvar_initialize(&hub_dev->pending_ops_cv);
 
-        usb_pipe_t *control_pipe = usb_device_get_default_pipe(usb_dev);
-
-        int opResult = usb_pipe_start_long_transfer(control_pipe);
-        if (opResult != EOK) {
-                usb_log_error("Failed to start long ctrl pipe transfer: %s\n",
-                    str_error(opResult));
-                return opResult;
-        }
-
         /* Set hub's first configuration. (There should be only one) */
-        opResult = usb_set_first_configuration(usb_dev);
-        if (opResult != EOK) {
-                usb_pipe_end_long_transfer(control_pipe);
+        int opResult = usb_set_first_configuration(usb_dev);
+        if (opResult != EOK) {
                 usb_log_error("Could not set hub configuration: %s\n",
                     str_error(opResult));
@@ -132 +122 @@
         opResult = usb_hub_process_hub_specific_info(hub_dev);
         if (opResult != EOK) {
-                usb_pipe_end_long_transfer(control_pipe);
                 usb_log_error("Could process hub specific info, %s\n",
                     str_error(opResult));
@@ -143 +132 @@
             fun_exposed, HUB_FNC_NAME);
         if (hub_dev->hub_fun == NULL) {
-                usb_pipe_end_long_transfer(control_pipe);
                 usb_log_error("Failed to create hub function.\n");
                 return ENOMEM;
@@ -151 +139 @@
         opResult = ddf_fun_bind(hub_dev->hub_fun);
         if (opResult != EOK) {
-                usb_pipe_end_long_transfer(control_pipe);
                 usb_log_error("Failed to bind hub function: %s.\n",
                    str_error(opResult));
@@ -164 +151 @@
             -1, usb_hub_polling_terminated_callback, hub_dev);
         if (opResult != EOK) {
-                usb_pipe_end_long_transfer(control_pipe);
                 /* Function is already bound */
                 ddf_fun_unbind(hub_dev->hub_fun);
@@ -176 +162 @@
             usb_device_get_name(hub_dev->usb_device), hub_dev->port_count);
 
-        usb_pipe_end_long_transfer(control_pipe);
         return EOK;
 }