Index: uspace/drv/bus/isa/i8237.c
===================================================================
--- uspace/drv/bus/isa/i8237.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/isa/i8237.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -485,7 +485,9 @@
 
 	uint16_t remain = (value_high << 8 | value_low);
-	/* 16 bit DMA size is in words,
+	/*
+	 * 16 bit DMA size is in words,
 	 * the upper bits are bogus for 16bit transfers so we need to get
-	 * rid of them. Using limited type works well.*/
+	 * rid of them. Using limited type works well.
+	 */
 	if (is_dma16(channel))
 		remain <<= 1;
Index: uspace/drv/bus/usb/ehci/ehci_batch.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_batch.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ehci/ehci_batch.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -47,8 +47,10 @@
 #include "ehci_bus.h"
 
-/* The buffer pointer list in the qTD is long enough to support a maximum
+/*
+ * The buffer pointer list in the qTD is long enough to support a maximum
  * transfer size of 20K bytes. This case occurs when all five buffer pointers
  * are used and the first offset is zero. A qTD handles a 16Kbyte buffer
- * with any starting buffer alignment. EHCI specs p. 87 (pdf p. 97) */
+ * with any starting buffer alignment. EHCI specs p. 87 (pdf p. 97)
+ */
 #define EHCI_TD_MAX_TRANSFER   (16 * 1024)
 
@@ -177,6 +179,8 @@
 		return false;
 
-	/* Now we may be sure that either the ED is inactive because of errors
-	 * or all transfer descriptors completed successfully */
+	/*
+	 * Now we may be sure that either the ED is inactive because of errors
+	 * or all transfer descriptors completed successfully
+	 */
 
 	/* Assume all data got through */
@@ -192,5 +196,6 @@
 		ehci_batch->base.error = td_error(&ehci_batch->tds[i]);
 		if (ehci_batch->base.error == EOK) {
-			/* If the TD got all its data through, it will report
+			/*
+			 * If the TD got all its data through, it will report
 			 * 0 bytes remain, the sole exception is INPUT with
 			 * data rounding flag (short), i.e. every INPUT.
Index: uspace/drv/bus/usb/ehci/ehci_rh.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_rh.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -72,7 +72,9 @@
 	instance->hub_descriptor.header.descriptor_type = USB_DESCTYPE_HUB;
 	instance->hub_descriptor.header.port_count = instance->port_count;
-	/* Bits 0,1 indicate power switching mode
+	/*
+	 * Bits 0,1 indicate power switching mode
 	 * Bit 2 indicates device type (compound device)
-	 * Bits 3,4 indicate over-current protection mode */
+	 * Bits 3,4 indicate over-current protection mode
+	 */
 	instance->hub_descriptor.header.characteristics = 0 |
 	    ((hcs & EHCI_CAPS_HCS_PPC_FLAG) ? 0x09 : 0x12) |
@@ -313,6 +315,8 @@
 	    EHCI2USB(reg, USB_PORTSC_OC_CHANGE_FLAG, USB_HUB_PORT_STATUS_C_OC) |
 	    (hub->reset_flag[port] ? USB_HUB_PORT_STATUS_C_RESET : 0));
-	/* Note feature numbers for test and indicator feature do not
-	 * correspond to the port status bit locations */
+	/*
+	 * Note feature numbers for test and indicator feature do not
+	 * correspond to the port status bit locations
+	 */
 	usb_log_debug2("RH(%p-%u) port status: %" PRIx32 "(%" PRIx32 ")", hub, port,
 	    status, reg);
@@ -340,6 +344,8 @@
 	}
 	usb_log_debug("RH(%p-%u): Reset complete", job->hub, job->port);
-	/* Handle port ownership, if the port is not enabled
-	 * after reset it's a full speed device */
+	/*
+	 * Handle port ownership, if the port is not enabled
+	 * after reset it's a full speed device
+	 */
 	if (!(EHCI_RD(job->hub->registers->portsc[job->port]) &
 	    USB_PORTSC_ENABLED_FLAG)) {
Index: uspace/drv/bus/usb/ehci/hc.c
===================================================================
--- uspace/drv/bus/usb/ehci/hc.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ehci/hc.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -395,6 +395,8 @@
 	usb_log_debug("HC(%p): Starting HW.", instance);
 
-	/* Turn off the HC if it's running, Reseting a running device is
-	 * undefined */
+	/*
+	 * Turn off the HC if it's running, Reseting a running device is
+	 * undefined
+	 */
 	if (!(EHCI_RD(instance->registers->usbsts) & USB_STS_HC_HALTED_FLAG)) {
 		/* disable all interrupts */
@@ -487,8 +489,10 @@
 		return ret;
 	}
-	/* Specs say "Software must set queue head horizontal pointer T-bits to
+	/*
+	 * Specs say "Software must set queue head horizontal pointer T-bits to
 	 * a zero for queue heads in the asynchronous schedule" (4.4.0).
 	 * So we must maintain circular buffer (all horizontal pointers
-	 * have to be valid */
+	 * have to be valid
+	 */
 	endpoint_list_chain(&instance->async_list, &instance->async_list);
 
Index: uspace/drv/bus/usb/ehci/hw_struct/queue_head.c
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/queue_head.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ehci/hw_struct/queue_head.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -61,6 +61,8 @@
 	EHCI_MEM32_WR(instance->alternate, LINK_POINTER_TERM);
 	if (ep == NULL) {
-		/* Mark as halted and list head,
-		 * used by endpoint lists as dummy */
+		/*
+		 * Mark as halted and list head,
+		 * used by endpoint lists as dummy
+		 */
 		EHCI_MEM32_WR(instance->ep_char, QH_EP_CHAR_H_FLAG);
 		EHCI_MEM32_WR(instance->status, QH_STATUS_HALTED_FLAG);
@@ -76,6 +78,8 @@
 		if (ep->device->speed != USB_SPEED_HIGH)
 			EHCI_MEM32_SET(instance->ep_char, QH_EP_CHAR_C_FLAG);
-		/* Let BULK and INT use queue head managed toggle,
-		 * CONTROL needs special toggle handling anyway */
+		/*
+		 * Let BULK and INT use queue head managed toggle,
+		 * CONTROL needs special toggle handling anyway
+		 */
 		EHCI_MEM32_SET(instance->ep_char, QH_EP_CHAR_DTC_FLAG);
 	}
@@ -96,6 +100,8 @@
 	EHCI_MEM32_WR(instance->ep_cap, ep_cap);
 
-	/* The rest of the fields are transfer working area, it should be ok to
-	 * leave it NULL */
+	/*
+	 * The rest of the fields are transfer working area, it should be ok to
+	 * leave it NULL
+	 */
 }
 
Index: uspace/drv/bus/usb/ehci/res.c
===================================================================
--- uspace/drv/bus/usb/ehci/res.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ehci/res.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -80,6 +80,8 @@
 	usb_log_debug2("USBLEGSUP: %" PRIx32 ".", usblegsup);
 
-	/* Request control from firmware/BIOS by writing 1 to highest
-	 * byte. (OS Control semaphore)*/
+	/*
+	 * Request control from firmware/BIOS by writing 1 to highest
+	 * byte. (OS Control semaphore)
+	 */
 	usb_log_debug("Requesting OS control.");
 	ret = pci_config_space_write_8(parent_sess,
@@ -187,6 +189,8 @@
 	usb_log_debug2("Value of hcc params register: %x.", hcc_params);
 
-	/* Read value of EHCI Extended Capabilities Pointer
-	 * position of EEC registers (points to PCI config space) */
+	/*
+	 * Read value of EHCI Extended Capabilities Pointer
+	 * position of EEC registers (points to PCI config space)
+	 */
 	const uint32_t eecp =
 	    (hcc_params >> EHCI_CAPS_HCC_EECP_SHIFT) & EHCI_CAPS_HCC_EECP_MASK;
Index: uspace/drv/bus/usb/ohci/hc.c
===================================================================
--- uspace/drv/bus/usb/ohci/hc.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ohci/hc.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -400,5 +400,6 @@
 	usb_log_debug("Requesting OHCI control.");
 	if (OHCI_RD(instance->registers->revision) & R_LEGACY_FLAG) {
-		/* Turn off legacy emulation, it should be enough to zero
+		/*
+		 * Turn off legacy emulation, it should be enough to zero
 		 * the lowest bit, but it caused problems. Thus clear all
 		 * except GateA20 (causes restart on some hw).
@@ -447,6 +448,8 @@
 	}
 
-	/* HC is in reset (hw startup) => no other driver
-	 * maintain reset for at least the time specified in USB spec (50 ms)*/
+	/*
+	 * HC is in reset (hw startup) => no other driver
+	 * maintain reset for at least the time specified in USB spec (50 ms)
+	 */
 	usb_log_debug("Host controller found in reset state.");
 	async_usleep(50000);
Index: uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -69,6 +69,8 @@
 
 	if (ep == NULL) {
-		/* Mark as dead, used for dummy EDs at the beginning of
-		 * endpoint lists. */
+		/*
+		 * Mark as dead, used for dummy EDs at the beginning of
+		 * endpoint lists.
+		 */
 		OHCI_MEM32_WR(instance->status, ED_STATUS_K_FLAG);
 		return;
Index: uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -51,5 +51,6 @@
  * OHCI Endpoint Descriptor representation.
  *
- * See OHCI spec. Chapter 4.2, page 16 (pdf page 30) for details */
+ * See OHCI spec. Chapter 4.2, page 16 (pdf page 30) for details
+ */
 typedef struct ed {
 	/**
Index: uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -44,7 +44,9 @@
 #include "completion_codes.h"
 
-/* OHCI TDs can handle up to 8KB buffers, however, it can use max 2 pages.
+/*
+ * OHCI TDs can handle up to 8KB buffers, however, it can use max 2 pages.
  * Using 4KB buffers guarantees the page count condition.
- * (OHCI assumes 4KB pages) */
+ * (OHCI assumes 4KB pages)
+ */
 #define OHCI_TD_MAX_TRANSFER (4 * 1024)
 
@@ -76,5 +78,6 @@
 	/**
 	 * Current buffer pointer.
-	 * Phys address of the first byte to be transferred. */
+	 * Phys address of the first byte to be transferred.
+	 */
 	volatile uint32_t cbp;
 
@@ -105,7 +108,9 @@
 	const int cc = (OHCI_MEM32_RD(instance->status) >> TD_STATUS_CC_SHIFT) &
 	    TD_STATUS_CC_MASK;
-	/* This value is changed on transfer completion,
+	/*
+	 * This value is changed on transfer completion,
 	 * either to CC_NOERROR or and error code.
-	 * See OHCI spec 4.3.1.3.5 p. 23 (pdf 37) */
+	 * See OHCI spec 4.3.1.3.5 p. 23 (pdf 37)
+	 */
 	if (cc != CC_NOACCESS1 && cc != CC_NOACCESS2) {
 		return true;
Index: uspace/drv/bus/usb/ohci/ohci_batch.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_batch.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/ohci/ohci_batch.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -163,6 +163,8 @@
 		return false;
 
-	/* Now we may be sure that either the ED is inactive because of errors
-	 * or all transfer descriptors completed successfully */
+	/*
+	 * Now we may be sure that either the ED is inactive because of errors
+	 * or all transfer descriptors completed successfully
+	 */
 
 	/* Assume all data got through */
@@ -178,5 +180,6 @@
 		usb_batch->error = td_error(ohci_batch->tds[i]);
 		if (usb_batch->error == EOK) {
-			/* If the TD got all its data through, it will report
+			/*
+			 * If the TD got all its data through, it will report
 			 * 0 bytes remain, the sole exception is INPUT with
 			 * data rounding flag (short), i.e. every INPUT.
@@ -199,5 +202,6 @@
 			assert((ohci_ep->ed->td_head & ED_TDHEAD_HALTED_FLAG) != 0);
 
-			/* We don't care where the processing stopped, we just
+			/*
+			 * We don't care where the processing stopped, we just
 			 * need to make sure it's not using any of the TDs owned
 			 * by the transfer.
Index: uspace/drv/bus/usb/uhci/hw_struct/queue_head.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/queue_head.h	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/uhci/hw_struct/queue_head.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -78,7 +78,9 @@
 static inline void qh_set_next_qh(qh_t *instance, qh_t *next)
 {
-	/* Physical address has to be below 4GB,
+	/*
+	 * Physical address has to be below 4GB,
 	 * it is an UHCI limitation and malloc32
-	 * should guarantee this */
+	 * should guarantee this
+	 */
 	const uint32_t pa = addr_to_phys(next);
 	if (pa) {
@@ -98,7 +100,9 @@
 static inline void qh_set_element_td(qh_t *instance, td_t *td)
 {
-	/* Physical address has to be below 4GB,
+	/*
+	 * Physical address has to be below 4GB,
 	 * it is an UHCI limitation and malloc32
-	 * should guarantee this */
+	 * should guarantee this
+	 */
 	const uint32_t pa = addr_to_phys(td);
 	if (pa) {
Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -127,6 +127,8 @@
 		return EIO;
 
-	/* CRC or timeout error, like device not present or bad data,
-	 * it won't be reported unless err count reached zero */
+	/*
+	 * CRC or timeout error, like device not present or bad data,
+	 * it won't be reported unless err count reached zero
+	 */
 	if ((instance->status & TD_STATUS_ERROR_CRC) != 0)
 		return EBADCHECKSUM;
@@ -144,6 +146,8 @@
 		return EIO;
 
-	/* Stall might represent err count reaching zero or stall response from
-	 * the device. If err count reached zero, one of the above is reported*/
+	/*
+	 * Stall might represent err count reaching zero or stall response from
+	 * the device. If err count reached zero, one of the above is reported
+	 */
 	if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
 		return ESTALL;
Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -90,5 +90,6 @@
 	volatile uint32_t buffer_ptr;
 
-	/* According to UHCI design guide, there is 16 bytes of
+	/*
+	 * According to UHCI design guide, there is 16 bytes of
 	 * data available here.
 	 * According to Linux kernel the hardware does not care,
Index: uspace/drv/bus/usb/uhci/main.c
===================================================================
--- uspace/drv/bus/usb/uhci/main.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/uhci/main.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -76,6 +76,8 @@
 		return ENOMEM;
 
-	/* See UHCI design guide page 45 for these values.
-	 * Write all WC bits in USB legacy register */
+	/*
+	 * See UHCI design guide page 45 for these values.
+	 * Write all WC bits in USB legacy register
+	 */
 	return pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
 }
Index: uspace/drv/bus/usb/uhci/uhci_batch.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_batch.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/uhci/uhci_batch.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -87,5 +87,6 @@
 }
 
-/* Prepares batch for commiting.
+/*
+ * Prepares batch for committing.
  *
  * Determines the number of needed transfer descriptors (TDs).
Index: uspace/drv/bus/usb/uhci/uhci_rh.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -153,9 +153,13 @@
 	while ((port_status = pio_read_16(port)) & STATUS_IN_RESET)
 		;
-	/* PIO delay, should not be longer than 3ms as the device might
-	 * enter suspend state. */
+	/*
+	 * PIO delay, should not be longer than 3ms as the device might
+	 * enter suspend state.
+	 */
 	udelay(10);
-	/* Drop ConnectionChange as some UHCI hw
-	 * sets this bit after reset, that is incorrect */
+	/*
+	 * Drop ConnectionChange as some UHCI hw
+	 * sets this bit after reset, that is incorrect
+	 */
 	port_status &= ~STATUS_WC_BITS;
 	pio_write_16(port, port_status | STATUS_ENABLED | STATUS_CONNECTED_CHANGED);
@@ -376,6 +380,8 @@
 		RH_DEBUG(hub, port, "Set port change flag (status %" PRIx16
 		    ")", status);
-		/* These are voluntary and don't have to be set
-		 * there is no way we could do it on UHCI anyway */
+		/*
+		 * These are voluntary and don't have to be set
+		 * there is no way we could do it on UHCI anyway
+		 */
 		break;
 	default:
@@ -459,6 +465,8 @@
 		CLASS_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_HUB_REQUEST_CLEAR_FEATURE),
 		.name = "ClearHubFeature",
-		/* Hub features are overcurrent and supply good,
-		 * this request may only clear changes that we never report*/
+		/*
+		 * Hub features are overcurrent and supply good,
+		 * this request may only clear changes that we never report
+		 */
 		.callback = req_nop,
 	},
@@ -471,6 +479,8 @@
 		CLASS_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_HUB_REQUEST_GET_STATUS),
 		.name = "GetHubStatus",
-		/* UHCI can't report OC condition or,
-		 * lose power source */
+		/*
+		 * UHCI can't report OC condition or,
+		 * lose power source
+		 */
 		.callback = virthub_base_get_null_status,
 	},
@@ -483,6 +493,8 @@
 		CLASS_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_HUB_REQUEST_SET_FEATURE),
 		.name = "SetHubFeature",
-		/* Hub features are overcurrent and supply good,
-		 * this request may only set changes that we never report*/
+		/*
+		 * Hub features are overcurrent and supply good,
+		 * this request may only set changes that we never report
+		 */
 		.callback = req_nop,
 	},
Index: uspace/drv/bus/usb/usbhub/port.c
===================================================================
--- uspace/drv/bus/usb/usbhub/port.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/usbhub/port.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -236,9 +236,11 @@
 	const bool overcurrent = !!(status & USB_HUB_PORT_STATUS_OC);
 
-	/* According to the USB specs:
+	/*
+	 * According to the USB specs:
 	 * 11.13.5 Over-current Reporting and Recovery
 	 * Hub device is responsible for putting port in power off
 	 * mode. USB system software is responsible for powering port
-	 * back on when the over-current condition is gone */
+	 * back on when the over-current condition is gone
+	 */
 
 	usb_port_disabled(&port->base, &remove_device);
Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -460,6 +460,8 @@
 	}
 
-	/* Set configuration. Use the configuration that was in
-	 * usb_device->descriptors.configuration i.e. The first one. */
+	/*
+	 * Set configuration. Use the configuration that was in
+	 * usb_device->descriptors.configuration i.e. The first one.
+	 */
 	errno_t opResult = usb_request_set_configuration(
 	    usb_device_get_default_pipe(usb_device),
@@ -593,7 +595,9 @@
 	assert(status);
 
-	/* USB hub specific GET_PORT_STATUS request. See USB Spec 11.16.2.6
+	/*
+	 * USB hub specific GET_PORT_STATUS request. See USB Spec 11.16.2.6
 	 * Generic GET_STATUS request cannot be used because of the difference
-	 * in status data size (2B vs. 4B)*/
+	 * in status data size (2B vs. 4B)
+	 */
 	const usb_device_request_setup_packet_t request = {
 		.request_type = USB_HUB_REQ_TYPE_GET_PORT_STATUS,
@@ -635,6 +639,8 @@
 	usb_hub_status_t status;
 	size_t rcvd_size;
-	/* NOTE: We can't use standard USB GET_STATUS request, because
-	 * hubs reply is 4byte instead of 2 */
+	/*
+	 * NOTE: We can't use standard USB GET_STATUS request, because
+	 * hubs reply is 4byte instead of 2
+	 */
 	const errno_t opResult = usb_pipe_control_read(control_pipe,
 	    &get_hub_status_request, sizeof(get_hub_status_request),
@@ -666,5 +672,6 @@
 
 	if (status & USB_HUB_STATUS_C_LOCAL_POWER) {
-		/* NOTE: Handling this is more complicated.
+		/*
+		 * NOTE: Handling this is more complicated.
 		 * If the transition is from bus power to local power, all
 		 * is good and we may signal the parent hub that we don't
Index: uspace/drv/bus/usb/usbmid/explore.c
===================================================================
--- uspace/drv/bus/usb/usbmid/explore.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/usbmid/explore.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -85,6 +85,8 @@
 	    usb_dp_get_nested_descriptor(&parser, &data, config_descriptor);
 
-	/* Walk all descriptors nested in the current configuration decriptor;
-	 * i.e. all interface descriptors. */
+	/*
+	 * Walk all descriptors nested in the current configuration decriptor;
+	 * i.e. all interface descriptors.
+	 */
 	for (; interface_ptr != NULL;
 	    interface_ptr = usb_dp_get_sibling_descriptor(
@@ -99,6 +101,8 @@
 		/* Skip alternate interfaces. */
 		if (interface_in_list(list, interface->interface_number)) {
-			/* TODO: add the alternatives and create match ids
-			 * for them. */
+			/*
+			 * TODO: add the alternatives and create match ids
+			 * for them.
+			 */
 			continue;
 		}
Index: uspace/drv/bus/usb/xhci/commands.c
===================================================================
--- uspace/drv/bus/usb/xhci/commands.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/xhci/commands.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -358,5 +358,6 @@
 
 	if (code == XHCI_TRBC_COMMAND_RING_STOPPED) {
-		/* This can either mean that the ring is being stopped, or
+		/*
+		 * This can either mean that the ring is being stopped, or
 		 * a command was aborted. In either way, wake threads waiting
 		 * on stopped_cv.
@@ -671,5 +672,6 @@
 
 	if (XHCI_REG_RD(hc->op_regs, XHCI_OP_CRR)) {
-		/* 4.6.1.2, implementation note
+		/*
+		 * 4.6.1.2, implementation note
 		 * Assume there are larger problems with HC and
 		 * reset it.
@@ -720,5 +722,6 @@
 		    &cmd->_header.completed_mtx, XHCI_COMMAND_TIMEOUT);
 
-		/* The waiting timed out. Current command (not necessarily
+		/*
+		 * The waiting timed out. Current command (not necessarily
 		 * ours) is probably blocked.
 		 */
Index: uspace/drv/bus/usb/xhci/hc.c
===================================================================
--- uspace/drv/bus/usb/xhci/hc.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/xhci/hc.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -534,6 +534,8 @@
 	joinable_fibril_join(hc->event_worker);
 
-	/* Then, disconnect all roothub devices, which shall trigger
-	 * disconnection of everything */
+	/*
+	 * Then, disconnect all roothub devices, which shall trigger
+	 * disconnection of everything
+	 */
 	xhci_rh_stop(&hc->rh);
 }
@@ -576,6 +578,8 @@
 		XHCI_REG_WR(hc->rt_regs->ir, XHCI_INTR_IP, 1);
 
-		/* interrupt handler expects status from irq_commands, which is
-		 * in xhci order. */
+		/*
+		 * interrupt handler expects status from irq_commands, which is
+		 * in xhci order.
+		 */
 		*status = host2xhci(32, *status);
 	}
@@ -873,6 +877,8 @@
 	xhci_endpoint_t *ep0 = xhci_endpoint_get(dev->base.endpoints[0]);
 
-	/* Although we have the precise PSIV value on devices of tier 1,
-	 * we have to rely on reverse mapping on others. */
+	/*
+	 * Although we have the precise PSIV value on devices of tier 1,
+	 * we have to rely on reverse mapping on others.
+	 */
 	if (!usb_speed_to_psiv[dev->base.speed]) {
 		usb_log_error("Device reported an USB speed (%s) that cannot be mapped "
Index: uspace/drv/bus/usb/xhci/hw_struct/regs.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/regs.h	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/xhci/hw_struct/regs.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -368,5 +368,6 @@
 	ioport32_t dnctrl;
 
-	/*          3  2  1   0
+	/*
+	 *          3  2  1   0
 	 *  3:0 - CRR CA CS RCS
 	 * 64:6 - Command Ring Pointer
Index: uspace/drv/bus/usb/xhci/rh.c
===================================================================
--- uspace/drv/bus/usb/xhci/rh.c	(revision ae7d03c05f24b857bbbdbcf3dafbf8ecc6c286ab)
+++ uspace/drv/bus/usb/xhci/rh.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -291,5 +291,6 @@
 	joinable_fibril_start(rh->event_worker);
 
-	/* The reset changed status of all ports, and SW originated reason does
+	/*
+	 * The reset changed status of all ports, and SW originated reason does
 	 * not cause an interrupt.
 	 */
