Index: uspace/drv/audio/sb16/registers.h
===================================================================
--- uspace/drv/audio/sb16/registers.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/audio/sb16/registers.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -56,11 +56,11 @@
 	ioport8_t fm_data2;
 	ioport8_t dsp_data_read;
-	ioport8_t __reserved2; /*0xb*/
+	ioport8_t __reserved2; /* 0xb */
 	ioport8_t dsp_write; /* Both command and data, bit 7 is write status */
 #define DSP_WRITE_BUSY (1 << 7)
-	ioport8_t __reserved3; /*0xd*/
+	ioport8_t __reserved3; /* 0xd */
 	ioport8_t dsp_read_status; /* Bit 7 */
 #define DSP_READ_READY (1 << 7)
-	ioport8_t dma16_ack; /*0xf*/
+	ioport8_t dma16_ack; /* 0xf */
 	ioport8_t cd_command_data;
 	ioport8_t cd_status;
Index: uspace/drv/block/ahci/ahci.c
===================================================================
--- uspace/drv/block/ahci/ahci.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/block/ahci/ahci.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -131,7 +131,7 @@
 static int sata_devices_count = 0;
 
-/*----------------------------------------------------------------------------*/
-/*-- AHCI Interface ----------------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * AHCI Interface
+ */
 
 static ahci_iface_t ahci_interface = {
@@ -298,7 +298,7 @@
 }
 
-/*----------------------------------------------------------------------------*/
-/*-- AHCI Commands -----------------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * AHCI Commands
+ */
 
 /** Wait for interrupt event.
@@ -842,7 +842,7 @@
 }
 
-/*----------------------------------------------------------------------------*/
-/*-- Interrupts handling -----------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * Interrupts handling
+ */
 
 static irq_pio_range_t ahci_ranges[] = {
@@ -919,7 +919,7 @@
 }
 
-/*----------------------------------------------------------------------------*/
-/*-- AHCI and SATA device creating and initializing routines -----------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * AHCI and SATA device creating and initializing routines
+ */
 
 /** Allocate SATA device structure with buffers for hardware.
@@ -1273,7 +1273,7 @@
 }
 
-/*----------------------------------------------------------------------------*/
-/*-- Helpers and utilities ---------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * Helpers and utilities
+ */
 
 /** Convert SATA model name
@@ -1313,7 +1313,7 @@
 }
 
-/*----------------------------------------------------------------------------*/
-/*-- AHCI Main routine -------------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * AHCI Main routine
+ */
 
 int main(int argc, char *argv[])
Index: uspace/drv/block/ahci/ahci_hw.h
===================================================================
--- uspace/drv/block/ahci/ahci_hw.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/block/ahci/ahci_hw.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -36,14 +36,14 @@
 #include <stdint.h>
 
-/*----------------------------------------------------------------------------*/
-/*-- AHCI standard constants -------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * AHCI standard constants
+ */
 
 /** AHCI standard 1.3 - maximum ports. */
 #define AHCI_MAX_PORTS  32
 
-/*----------------------------------------------------------------------------*/
-/*-- AHCI PCI Registers ------------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * AHCI PCI Registers
+ */
 
 /** AHCI PCI register Identifiers offset. */
@@ -296,7 +296,7 @@
 } ahci_pcireg_mlat_t;
 
-/*----------------------------------------------------------------------------*/
-/*-- AHCI Memory Registers ---------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * AHCI Memory Registers
+ */
 
 /** Number of pages for ahci memory registers. */
Index: uspace/drv/block/ahci/ahci_sata.h
===================================================================
--- uspace/drv/block/ahci/ahci_sata.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/block/ahci/ahci_sata.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -36,7 +36,7 @@
 #include <stdint.h>
 
-/*----------------------------------------------------------------------------*/
-/*-- SATA Buffer Lengths -----------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * SATA Buffer Lengths
+ */
 
 /** Default sector size in bytes. */
@@ -49,7 +49,7 @@
 #define SATA_IDENTIFY_DEVICE_BUFFER_LENGTH  512
 
-/*----------------------------------------------------------------------------*/
-/*-- SATA Fis Frames ---------------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * SATA Fis Frames
+ */
 
 /** Sata FIS Type number. */
@@ -130,7 +130,7 @@
 } sata_ncq_command_frame_t;
 
-/*----------------------------------------------------------------------------*/
-/*-- SATA Identify device ----------------------------------------------------*/
-/*----------------------------------------------------------------------------*/
+/*
+ * SATA Identify device
+ */
 
 /** Data returned from identify device and identify packet device command. */
Index: uspace/drv/bus/isa/i8237.c
===================================================================
--- uspace/drv/bus/isa/i8237.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/isa/i8237.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -198,5 +198,5 @@
 	.channels = {
 		/* The first chip 8-bit */
-		{ /* Channel 0 - Unusable*/
+		{ /* Channel 0 - Unusable */
 			.offset_reg_address = (uint8_t *) 0x00,
 			.size_reg_address = (uint8_t *) 0x01,
Index: uspace/drv/bus/usb/ehci/ehci_batch.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_batch.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/ehci/ehci_batch.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -138,5 +138,5 @@
 	memcpy(ehci_batch->setup_buffer, ehci_batch->base.setup.buffer, setup_size);
 
-	/* Generic data already prepared*/
+	/* Generic data already prepared */
 	ehci_batch->data_buffer = ehci_batch->base.dma_buffer.virt;
 
Index: uspace/drv/bus/usb/ehci/ehci_rh.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -86,5 +86,5 @@
 	instance->hub_descriptor.header.max_current = 0;
 
-	/* Device removable and some legacy 1.0 stuff*/
+	/* Device removable and some legacy 1.0 stuff */
 	instance->hub_descriptor.rempow[0] = 0xff;
 	instance->hub_descriptor.rempow[1] = 0xff;
@@ -410,5 +410,5 @@
 	/* Enabled features to clear: see page 269 of USB specs */
 	switch (feature) {
-	case USB_HUB_FEATURE_PORT_POWER:          /*8*/
+	case USB_HUB_FEATURE_PORT_POWER:          /* 8 */
 		usb_log_debug2("RH(%p-%u): Clear port power.", hub, port);
 		EHCI_CLR(hub->registers->portsc[port],
@@ -416,5 +416,5 @@
 		return EOK;
 
-	case USB2_HUB_FEATURE_PORT_ENABLE:         /*1*/
+	case USB2_HUB_FEATURE_PORT_ENABLE:         /* 1 */
 		usb_log_debug2("RH(%p-%u): Clear port enable.", hub, port);
 		EHCI_CLR(hub->registers->portsc[port],
@@ -422,5 +422,5 @@
 		return EOK;
 
-	case USB2_HUB_FEATURE_PORT_SUSPEND:        /*2*/
+	case USB2_HUB_FEATURE_PORT_SUSPEND:        /* 2 */
 		usb_log_debug2("RH(%p-%u): Clear port suspend.", hub, port);
 		/* If not in suspend it's noop */
@@ -434,5 +434,5 @@
 		return delayed_job(stop_resume, hub, port);
 
-	case USB_HUB_FEATURE_C_PORT_CONNECTION:   /*16*/
+	case USB_HUB_FEATURE_C_PORT_CONNECTION:   /* 16 */
 		usb_log_debug2("RH(%p-%u): Clear port connection change.",
 		    hub, port);
@@ -440,5 +440,5 @@
 		    USB_PORTSC_CONNECT_CH_FLAG);
 		return EOK;
-	case USB2_HUB_FEATURE_C_PORT_ENABLE:       /*17*/
+	case USB2_HUB_FEATURE_C_PORT_ENABLE:       /* 17 */
 		usb_log_debug2("RH(%p-%u): Clear port enable change.",
 		    hub, port);
@@ -446,5 +446,5 @@
 		    USB_PORTSC_CONNECT_CH_FLAG);
 		return EOK;
-	case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: /*19*/
+	case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: /* 19 */
 		usb_log_debug2("RH(%p-%u): Clear port OC change.",
 		    hub, port);
@@ -452,10 +452,10 @@
 		    USB_PORTSC_OC_CHANGE_FLAG);
 		return EOK;
-	case USB2_HUB_FEATURE_C_PORT_SUSPEND:      /*18*/
+	case USB2_HUB_FEATURE_C_PORT_SUSPEND:      /* 18 */
 		usb_log_debug2("RH(%p-%u): Clear port suspend change.",
 		    hub, port);
 		hub->resume_flag[port] = false;
 		return EOK;
-	case USB_HUB_FEATURE_C_PORT_RESET:        /*20*/
+	case USB_HUB_FEATURE_C_PORT_RESET:        /* 20 */
 		usb_log_debug2("RH(%p-%u): Clear port reset change.",
 		    hub, port);
@@ -487,15 +487,15 @@
 	const unsigned feature = uint16_usb2host(setup_packet->value);
 	switch (feature) {
-	case USB2_HUB_FEATURE_PORT_ENABLE:  /*1*/
+	case USB2_HUB_FEATURE_PORT_ENABLE:  /* 1 */
 		usb_log_debug2("RH(%p-%u): Set port enable.", hub, port);
 		EHCI_SET(hub->registers->portsc[port],
 		    USB_PORTSC_ENABLED_FLAG);
 		return EOK;
-	case USB2_HUB_FEATURE_PORT_SUSPEND: /*2*/
+	case USB2_HUB_FEATURE_PORT_SUSPEND: /* 2 */
 		usb_log_debug2("RH(%p-%u): Set port suspend.", hub, port);
 		EHCI_SET(hub->registers->portsc[port],
 		    USB_PORTSC_SUSPEND_FLAG);
 		return EOK;
-	case USB_HUB_FEATURE_PORT_RESET:   /*4*/
+	case USB_HUB_FEATURE_PORT_RESET:   /* 4 */
 		usb_log_debug2("RH(%p-%u): Set port reset.", hub, port);
 		EHCI_SET(hub->registers->portsc[port],
@@ -503,5 +503,5 @@
 		//TODO: What if creating the delayed job fails?
 		return delayed_job(stop_reset, hub, port);
-	case USB_HUB_FEATURE_PORT_POWER:   /*8*/
+	case USB_HUB_FEATURE_PORT_POWER:   /* 8 */
 		usb_log_debug2("RH(%p-%u): Set port power.", hub, port);
 		EHCI_SET(hub->registers->portsc[port],
Index: uspace/drv/bus/usb/ehci/endpoint_list.h
===================================================================
--- uspace/drv/bus/usb/ehci/endpoint_list.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/ehci/endpoint_list.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -42,5 +42,5 @@
 #include "hw_struct/queue_head.h"
 
-/** Structure maintains both EHCI queue and software list of active endpoints.*/
+/** Structure maintains both EHCI queue and software list of active endpoints. */
 typedef struct endpoint_list {
 	/** Guard against add/remove races */
Index: uspace/drv/bus/usb/ohci/endpoint_list.h
===================================================================
--- uspace/drv/bus/usb/ohci/endpoint_list.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/ohci/endpoint_list.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -44,5 +44,5 @@
 #include "hw_struct/endpoint_descriptor.h"
 
-/** Structure maintains both OHCI queue and software list of active endpoints.*/
+/** Structure maintains both OHCI queue and software list of active endpoints. */
 typedef struct endpoint_list {
 	/** Guard against add/remove races */
Index: uspace/drv/bus/usb/ohci/hc.c
===================================================================
--- uspace/drv/bus/usb/ohci/hc.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/ohci/hc.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -192,5 +192,5 @@
 {
 	assert(instance);
-	/* TODO: implement*/
+	/* TODO: implement */
 	return ENOTSUP;
 }
@@ -595,5 +595,5 @@
 	}
 
-	/*Init HCCA */
+	/* Init HCCA */
 	instance->hcca = hcca_get();
 	if (instance->hcca == NULL)
Index: uspace/drv/bus/usb/ohci/ohci_bus.h
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_bus.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/ohci/ohci_bus.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -63,5 +63,5 @@
 	dma_buffer_t dma_buffer;
 
-	/** Link in endpoint_list*/
+	/** Link in endpoint_list */
 	link_t eplist_link;
 	/** Link in pending_endpoints */
Index: uspace/drv/bus/usb/ohci/ohci_regs.h
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_regs.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/ohci/ohci_regs.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -261,7 +261,7 @@
 /** Number of downstream ports, max 15 */
 #define RHDA_NDS_MASK  (0xff)
-/** Power switching mode: 0-global, 1-per port*/
+/** Power switching mode: 0-global, 1-per port */
 #define RHDA_PSM_FLAG  (1 << 8)
-/** No power switch: 1-power on, 0-use PSM*/
+/** No power switch: 1-power on, 0-use PSM */
 #define RHDA_NPS_FLAG  (1 << 9)
 /** 1-Compound device, must be 0 */
@@ -317,5 +317,5 @@
 #define RHS_LPSC_FLAG (1 << 16)
 #define RHS_SET_GLOBAL_POWER RHS_LPSC_FLAG /* synonym for the above */
-/** Over-current change indicator*/
+/** Over-current change indicator */
 #define RHS_OCIC_FLAG (1 << 17)
 #define RHS_CLEAR_DRWE (1 << 31)
@@ -327,5 +327,5 @@
  */
 
-/** r: current connect status, w: 1-clear port enable, 0-N/S*/
+/** r: current connect status, w: 1-clear port enable, 0-N/S */
 #define RHPS_CCS_FLAG (1 << 0)
 #define RHPS_CLEAR_PORT_ENABLE RHPS_CCS_FLAG
Index: uspace/drv/bus/usb/ohci/ohci_rh.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_rh.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/ohci/ohci_rh.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -87,5 +87,5 @@
 	instance->hub_descriptor.header.max_current = 0;
 
-	/* Device Removable and some legacy 1.0 stuff*/
+	/* Device Removable and some legacy 1.0 stuff */
 	instance->hub_descriptor.rempow[0] =
 	    (port_desc >> RHDB_DR_SHIFT) & 0xff;
@@ -139,5 +139,5 @@
 	OHCI_CLR(regs->rh_desc_a, RHDA_PSM_FLAG);
 
-	/* Turn off power (hub driver will turn this back on)*/
+	/* Turn off power (hub driver will turn this back on) */
 	OHCI_WR(regs->rh_status, RHS_CLEAR_GLOBAL_POWER);
 
@@ -348,5 +348,5 @@
 	/* Enabled features to clear: see page 269 of USB specs */
 	switch (feature) {
-	case USB_HUB_FEATURE_PORT_POWER:          /*8*/
+	case USB_HUB_FEATURE_PORT_POWER:          /* 8 */
 		rhda = OHCI_RD(hub->registers->rh_desc_a);
 		/* No power switching */
@@ -362,19 +362,19 @@
 		    RHPS_CLEAR_PORT_POWER);
 		return EOK;
-	case USB2_HUB_FEATURE_PORT_ENABLE:         /*1*/
+	case USB2_HUB_FEATURE_PORT_ENABLE:         /* 1 */
 		OHCI_WR(hub->registers->rh_port_status[port],
 		    RHPS_CLEAR_PORT_ENABLE);
 		return EOK;
 
-	case USB2_HUB_FEATURE_PORT_SUSPEND:        /*2*/
+	case USB2_HUB_FEATURE_PORT_SUSPEND:        /* 2 */
 		OHCI_WR(hub->registers->rh_port_status[port],
 		    RHPS_CLEAR_PORT_SUSPEND);
 		return EOK;
 
-	case USB_HUB_FEATURE_C_PORT_CONNECTION:   /*16*/
-	case USB2_HUB_FEATURE_C_PORT_ENABLE:       /*17*/
-	case USB2_HUB_FEATURE_C_PORT_SUSPEND:      /*18*/
-	case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: /*19*/
-	case USB_HUB_FEATURE_C_PORT_RESET:        /*20*/
+	case USB_HUB_FEATURE_C_PORT_CONNECTION:   /* 16 */
+	case USB2_HUB_FEATURE_C_PORT_ENABLE:       /* 17 */
+	case USB2_HUB_FEATURE_C_PORT_SUSPEND:      /* 18 */
+	case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: /* 19 */
+	case USB_HUB_FEATURE_C_PORT_RESET:        /* 20 */
 		usb_log_debug2("Clearing port C_CONNECTION, C_ENABLE, "
 		    "C_SUSPEND, C_OC or C_RESET on port %u.", port);
@@ -408,5 +408,5 @@
 
 	switch (feature) {
-	case USB_HUB_FEATURE_PORT_POWER:   /*8*/
+	case USB_HUB_FEATURE_PORT_POWER:   /* 8 */
 		rhda = OHCI_RD(hub->registers->rh_desc_a);
 
@@ -422,7 +422,7 @@
 		/* Fall through, for per port power */
 		/* Fallthrough */
-	case USB2_HUB_FEATURE_PORT_ENABLE:  /*1*/
-	case USB2_HUB_FEATURE_PORT_SUSPEND: /*2*/
-	case USB_HUB_FEATURE_PORT_RESET:   /*4*/
+	case USB2_HUB_FEATURE_PORT_ENABLE:  /* 1 */
+	case USB2_HUB_FEATURE_PORT_SUSPEND: /* 2 */
+	case USB_HUB_FEATURE_PORT_RESET:   /* 4 */
 		usb_log_debug2("Setting port POWER, ENABLE, SUSPEND or RESET "
 		    "on port %u.", port);
Index: uspace/drv/bus/usb/uhci/hc.c
===================================================================
--- uspace/drv/bus/usb/uhci/hc.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/uhci/hc.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -188,5 +188,5 @@
 
 		if (instance->hw_failures < UHCI_ALLOWED_HW_FAIL) {
-			/* reinitialize hw, this triggers virtual disconnect*/
+			/* reinitialize hw, this triggers virtual disconnect */
 			hc_init_hw(instance);
 		} else {
Index: uspace/drv/bus/usb/usbhub/usbhub.h
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/usbhub/usbhub.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -61,5 +61,5 @@
 	/** Speed of the hub */
 	usb_speed_t speed;
-	/** Generic usb device data*/
+	/** Generic usb device data */
 	usb_device_t *usb_device;
 	/** Data polling handle. */
Index: uspace/drv/bus/usb/xhci/hc.c
===================================================================
--- uspace/drv/bus/usb/xhci/hc.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/bus/usb/xhci/hc.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -886,5 +886,5 @@
 	}
 
-	/* Issue configure endpoint command (sec 4.3.5). */
+	/* Issue configure endpoint command (sec 4.3.5).  */
 	dma_buffer_t ictx_dma_buf;
 	if ((err = create_configure_ep_input_ctx(dev, &ictx_dma_buf)))
@@ -928,5 +928,5 @@
 	xhci_cmd_t cmd;
 
-	/* Issue configure endpoint command (sec 4.3.5). */
+	/* Issue configure endpoint command (sec 4.3.5).  */
 	dma_buffer_t ictx_dma_buf;
 	errno_t err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
@@ -957,5 +957,5 @@
 		return EOK;
 
-	/* Issue configure endpoint command (sec 4.3.5) with the DC flag. */
+	/* Issue configure endpoint command (sec 4.3.5) with the DC flag.  */
 	xhci_cmd_init(&cmd, XHCI_CMD_CONFIGURE_ENDPOINT);
 	cmd.slot_id = dev->slot_id;
@@ -981,5 +981,5 @@
 	xhci_cmd_t cmd;
 
-	/* Issue configure endpoint command (sec 4.3.5). */
+	/* Issue configure endpoint command (sec 4.3.5).  */
 	dma_buffer_t ictx_dma_buf;
 	errno_t err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
@@ -1020,5 +1020,5 @@
 		return EOK;
 
-	/* Issue configure endpoint command (sec 4.3.5). */
+	/* Issue configure endpoint command (sec 4.3.5).  */
 	dma_buffer_t ictx_dma_buf;
 	errno_t err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
Index: uspace/drv/char/i8042/i8042.h
===================================================================
--- uspace/drv/char/i8042/i8042.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/char/i8042/i8042.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -77,5 +77,5 @@
 /** i8042 Controller. */
 typedef struct i8042 {
-	/**< I/O registers. */
+	/** I/O registers. */
 	i8042_regs_t *regs;
 	/** Keyboard port */
@@ -83,5 +83,5 @@
 	/** AUX port */
 	i8042_port_t *aux;
-	/** Prevents simultanous port writes.*/
+	/** Prevents simultanous port writes. */
 	fibril_mutex_t write_guard;
 } i8042_t;
Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/char/ns8250/ns8250.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -157,5 +157,5 @@
 	/** Parent session */
 	async_sess_t *parent_sess;
-	/** I/O registers **/
+	/** I/O registers */
 	ns8250_regs_t *regs;
 	/** Are there any clients connected to the device? */
Index: uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c
===================================================================
--- uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -166,5 +166,5 @@
 	regs->irqenable = 0;
 
-	/* Pixel format specifics*/
+	/* Pixel format specifics */
 	uint32_t attrib_pixel_format = 0;
 	uint32_t control_data_lanes = 0;
Index: uspace/drv/hid/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/hid/usbhid/generic/hiddev.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/hid/usbhid/generic/hiddev.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -120,5 +120,5 @@
 	}
 
-	/*! @todo This should probably be somehow atomic. */
+	/* TODO This should probably be somehow atomic. */
 	memcpy(buffer, hid_dev->input_report,
 	    hid_dev->input_report_size);
Index: uspace/drv/hid/usbhid/multimedia/keymap.c
===================================================================
--- uspace/drv/hid/usbhid/multimedia/keymap.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/hid/usbhid/multimedia/keymap.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -52,18 +52,18 @@
 	[0xb7] = 0,       /* Stop */
 	[0xb8] = 0,       /* Eject */
-	[0xcd] = 0/*KC_F2*/,   /* Play/Pause */
-	[0xe2] = 0/*KC_F3*/,   /* Mute */
-	[0xe9] = 0/*KC_F5*/,   /* Volume Increment */
-	[0xea] = 0/*KC_F4*/,   /* Volume Decrement */
-	[0x183] = 0/*KC_F1*/,      /* AL Consumer Control Configuration */
+	[0xcd] = 0,       /* Play/Pause */
+	[0xe2] = 0,       /* Mute */
+	[0xe9] = 0,       /* Volume Increment */
+	[0xea] = 0,       /* Volume Decrement */
+	[0x183] = 0,      /* AL Consumer Control Configuration */
 	[0x18a] = 0,      /* AL Email Reader */
 	[0x192] = 0,      /* AL Calculator */
 	[0x221] = 0,      /* AC Search */
-	[0x223] = 0/*KC_F6*/,      /* AC Home */
+	[0x223] = 0,      /* AC Home */
 	[0x224] = 0,      /* AC Back */
 	[0x225] = 0,      /* AC Forward */
 	[0x226] = 0,      /* AC Stop */
-	[0x227] = 0,  /* AC Refresh */
-	[0x22a] = 0   /* AC Bookmarks */
+	[0x227] = 0,      /* AC Refresh */
+	[0x22a] = 0       /* AC Bookmarks */
 };
 
@@ -84,5 +84,5 @@
 		return -1;
 
-	/*! @todo What if the usage is not in the table? */
+	/* TODO What if the usage is not in the table? */
 	key = map[usage];
 
Index: uspace/drv/hid/usbhid/usbhid.c
===================================================================
--- uspace/drv/hid/usbhid/usbhid.c	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/hid/usbhid/usbhid.c	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -342,5 +342,5 @@
 
 	if (hid_dev->max_input_report_size >= buffer_size) {
-		/*! @todo This should probably be atomic. */
+		/* TODO This should probably be atomic. */
 		memcpy(hid_dev->input_report, buffer, buffer_size);
 		hid_dev->input_report_size = buffer_size;
Index: uspace/drv/nic/ar9271/ar9271.h
===================================================================
--- uspace/drv/nic/ar9271/ar9271.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/nic/ar9271/ar9271.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -234,8 +234,8 @@
 	{ 0x0000801c, 0x12e0002b },
 	{ 0x00008318, 0x00003440 },
-	{ 0x00009804, 0x000003c0 },  /*< Note: overridden */
+	{ 0x00009804, 0x000003c0 },  /**< Note: overridden */
 	{ 0x00009820, 0x02020200 },
 	{ 0x00009824, 0x01000e0e },
-	{ 0x00009828, 0x0a020001 },  /*< Note: overridden */
+	{ 0x00009828, 0x0a020001 },  /**< Note: overridden */
 	{ 0x00009834, 0x00000e0e },
 	{ 0x00009838, 0x00000007 },
Index: uspace/drv/nic/ne2k/dp8390.h
===================================================================
--- uspace/drv/nic/ne2k/dp8390.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/nic/ne2k/dp8390.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -230,5 +230,5 @@
 	async_sess_t *parent_sess;
 	/* Device configuration */
-	void *base_port; /**< Port assigned from ISA configuration **/
+	void *base_port; /**< Port assigned from ISA configuration */
 	void *port;
 	void *data_port;
Index: uspace/drv/nic/rtl8139/defs.h
===================================================================
--- uspace/drv/nic/rtl8139/defs.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/nic/rtl8139/defs.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -372,5 +372,5 @@
 	BMCR_AN_ENABLE = (1 << 12),  /**< Autonegotion enable */
 
-	/* 10,11 reserved*/
+	/* 10,11 reserved */
 
 	BMCR_AN_RESTART = (1 << 9),  /**< Restart autonegotion */
Index: uspace/drv/nic/rtl8139/driver.h
===================================================================
--- uspace/drv/nic/rtl8139/driver.h	(revision 6d527cffd20fa5648c8b88cbe556d850c86e2c69)
+++ uspace/drv/nic/rtl8139/driver.h	(revision 2ab8ab3c0a1e9771074c6e9d07ec1bf5e87ddafc)
@@ -145,5 +145,7 @@
 } rtl8139_t;
 
-/* ***** Pointers casting - for both amd64 and ia32 ***** */
+/*
+ * Pointers casting - for both amd64 and ia32
+ */
 
 /** Cast pointer to uint32_t
