Changeset 3bacee1 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

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

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

@@ -126 +126 @@
         port_log(debug, port, "Resetting port.");
         if ((err = usb_hub_set_port_feature(port->hub, port->port_number,
-                            USB_HUB_FEATURE_PORT_RESET))) {
+            USB_HUB_FEATURE_PORT_RESET))) {
                 port_log(warning, port, "Port reset request failed: %s",
                     str_error(err));
@@ -140 +140 @@
         port_log(debug, port, "Enumerating device.");
         if ((err = usbhc_device_enumerate(exch, port->port_number,
-                            port->speed))) {
+            port->speed))) {
                 port_log(error, port, "Failed to enumerate device: %s",
                     str_error(err));
@@ -165 +165 @@
         port_log(debug, port, "Issuing a warm reset.");
         if ((err = usb_hub_set_port_feature(port->hub, port->port_number,
-                            USB3_HUB_FEATURE_BH_PORT_RESET))) {
+            USB3_HUB_FEATURE_BH_PORT_RESET))) {
                 port_log(warning, port, "Port reset request failed: %s",
                     str_error(err));
@@ -179 +179 @@
         port_log(debug, port, "Enumerating device.");
         if ((err = usbhc_device_enumerate(exch, port->port_number,
-                            port->speed))) {
+            port->speed))) {
                 port_log(error, port, "Failed to enumerate device: %s",
                     str_error(err));
@@ -200 +200 @@
         }
 
-        const errno_t err = port->hub->speed == USB_SPEED_SUPER
-                ? enumerate_device_usb3(port, exch)
-                : enumerate_device_usb2(port, exch);
+        const errno_t err = port->hub->speed == USB_SPEED_SUPER ?
+            enumerate_device_usb3(port, exch) :
+            enumerate_device_usb2(port, exch);
 
         usb_device_bus_exchange_end(exch);
@@ -211 +211 @@
 {
         const bool connected = !!(status & USB_HUB_PORT_STATUS_CONNECTION);
-        port_log(debug, port, "Connection change: device %s.", connected
-            ? "attached" : "removed");
+        port_log(debug, port, "Connection change: device %s.", connected ?
+            "attached" : "removed");
 
         if (connected) {