Index: uspace/drv/bus/usb/uhci/uhci_batch.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_batch.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/bus/usb/uhci/uhci_batch.c	(revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93)
@@ -53,5 +53,5 @@
 
 /** Transfer batch setup table. */
-static void (*const batch_setup[])(uhci_transfer_batch_t*);
+static void (*const batch_setup[])(uhci_transfer_batch_t *);
 
 /** Destroys uhci_transfer_batch_t structure.
@@ -72,5 +72,5 @@
  * NULL otherwise.
  */
-uhci_transfer_batch_t * uhci_transfer_batch_create(endpoint_t *ep)
+uhci_transfer_batch_t *uhci_transfer_batch_create(endpoint_t *ep)
 {
 	uhci_transfer_batch_t *uhci_batch =
@@ -99,6 +99,6 @@
 	usb_transfer_batch_t *usb_batch = &uhci_batch->base;
 
-	uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1)
-		/ usb_batch->ep->max_packet_size;
+	uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1) /
+	    usb_batch->ep->max_packet_size;
 
 	if (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
@@ -106,10 +106,10 @@
 	}
 
-	const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL)
-		? USB_SETUP_PACKET_SIZE
-		: 0;
-
-	const size_t total_size = (sizeof(td_t) * uhci_batch->td_count)
-	    + sizeof(qh_t) + setup_size;
+	const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) ?
+	    USB_SETUP_PACKET_SIZE :
+	    0;
+
+	const size_t total_size = (sizeof(td_t) * uhci_batch->td_count) +
+	    sizeof(qh_t) + setup_size;
 
 	if (dma_buffer_alloc(&uhci_batch->uhci_dma_buffer, total_size)) {
@@ -162,5 +162,5 @@
 	uhci_endpoint_t *uhci_ep = (uhci_endpoint_t *) batch->ep;
 
-	for (size_t i = 0;i < uhci_batch->td_count; ++i) {
+	for (size_t i = 0; i < uhci_batch->td_count; ++i) {
 		if (td_is_active(&uhci_batch->tds[i])) {
 			return false;
@@ -180,6 +180,6 @@
 		}
 
-		batch->transferred_size
-		    += td_act_size(&uhci_batch->tds[i]);
+		batch->transferred_size +=
+		    td_act_size(&uhci_batch->tds[i]);
 		if (td_is_short(&uhci_batch->tds[i]))
 			goto substract_ret;
@@ -235,6 +235,6 @@
 		const size_t packet_size = min(remain_size, mps);
 
-		const td_t *next_td = (td + 1 < uhci_batch->td_count)
-		    ? &uhci_batch->tds[td + 1] : NULL;
+		const td_t *next_td = (td + 1 < uhci_batch->td_count) ?
+		    &uhci_batch->tds[td + 1] : NULL;
 
 		assert(td < uhci_batch->td_count);
@@ -328,6 +328,6 @@
 }
 
-static void (*const batch_setup[])(uhci_transfer_batch_t*) =
-{
+static void (*const batch_setup[])(uhci_transfer_batch_t *) =
+    {
 	[USB_TRANSFER_CONTROL] = batch_control,
 	[USB_TRANSFER_BULK] = batch_data,
Index: uspace/drv/bus/usb/vhc/hub/hub.c
===================================================================
--- uspace/drv/bus/usb/vhc/hub/hub.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/bus/usb/vhc/hub/hub.c	(revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93)
@@ -148,6 +148,6 @@
 		 */
 		//if (port->state == HUB_PORT_STATE_DISCONNECTED) {
-			port->state = HUB_PORT_STATE_DISABLED;
-			set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
+		port->state = HUB_PORT_STATE_DISABLED;
+		set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
 		//}
 
@@ -343,6 +343,6 @@
 	    port->state == HUB_PORT_STATE_ENABLED ? 1 : 0,
 	    /* Suspend. */
-	    (port->state == HUB_PORT_STATE_SUSPENDED)
-	    || (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0,
+	    (port->state == HUB_PORT_STATE_SUSPENDED) ||
+	    (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0,
 	    /* Over-current. */
 	    0,
@@ -358,6 +358,5 @@
 	    0,
 	    /* Reserved. */
-	    0, 0, 0, 0, 0, 0
-	    ) << 8;
+	    0, 0, 0, 0, 0, 0) << 8;
 
 	status |= (port->status_change << 16);