Index: uspace/drv/hid/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/hid/usbhid/generic/hiddev.c	(revision 622e7c90371690351474d65883d372074a6be553)
+++ uspace/drv/hid/usbhid/generic/hiddev.c	(revision d1582b502edcb7bfeef771a2019538f265e7e27c)
@@ -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 622e7c90371690351474d65883d372074a6be553)
+++ uspace/drv/hid/usbhid/multimedia/keymap.c	(revision d1582b502edcb7bfeef771a2019538f265e7e27c)
@@ -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 622e7c90371690351474d65883d372074a6be553)
+++ uspace/drv/hid/usbhid/usbhid.c	(revision d1582b502edcb7bfeef771a2019538f265e7e27c)
@@ -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;