Index: uspace/drv/hid/adb-kbd/adb-kbd.c
===================================================================
--- uspace/drv/hid/adb-kbd/adb-kbd.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/drv/hid/adb-kbd/adb-kbd.c	(revision 2c4e1cc2aa4f1a4b249af5c661e93ac170ba5158)
@@ -186,5 +186,6 @@
 	if (b1 != 0xff)
 		adb_kbd_data(kbd, b1);
-	(void)b0; (void)b1;
+	(void)b0;
+	(void)b1;
 }
 
Index: uspace/drv/hid/adb-kbd/main.c
===================================================================
--- uspace/drv/hid/adb-kbd/main.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/drv/hid/adb-kbd/main.c	(revision 2c4e1cc2aa4f1a4b249af5c661e93ac170ba5158)
@@ -65,5 +65,5 @@
 	adb_kbd_t *adb_kbd;
 
-        ddf_msg(LVL_DEBUG, "adb_kbd_dev_add(%p)", dev);
+	ddf_msg(LVL_DEBUG, "adb_kbd_dev_add(%p)", dev);
 	adb_kbd = ddf_dev_data_alloc(dev, sizeof(adb_kbd_t));
 	if (adb_kbd == NULL) {
@@ -79,30 +79,30 @@
 static errno_t adb_kbd_dev_remove(ddf_dev_t *dev)
 {
-        adb_kbd_t *adb_kbd = (adb_kbd_t *)ddf_dev_data_get(dev);
+	adb_kbd_t *adb_kbd = (adb_kbd_t *)ddf_dev_data_get(dev);
 
-        ddf_msg(LVL_DEBUG, "adb_kbd_dev_remove(%p)", dev);
+	ddf_msg(LVL_DEBUG, "adb_kbd_dev_remove(%p)", dev);
 
-        return adb_kbd_remove(adb_kbd);
+	return adb_kbd_remove(adb_kbd);
 }
 
 static errno_t adb_kbd_dev_gone(ddf_dev_t *dev)
 {
-        adb_kbd_t *adb_kbd = (adb_kbd_t *)ddf_dev_data_get(dev);
+	adb_kbd_t *adb_kbd = (adb_kbd_t *)ddf_dev_data_get(dev);
 
-        ddf_msg(LVL_DEBUG, "adb_kbd_dev_gone(%p)", dev);
+	ddf_msg(LVL_DEBUG, "adb_kbd_dev_gone(%p)", dev);
 
-        return adb_kbd_gone(adb_kbd);
+	return adb_kbd_gone(adb_kbd);
 }
 
 static errno_t adb_kbd_fun_online(ddf_fun_t *fun)
 {
-        ddf_msg(LVL_DEBUG, "adb_kbd_fun_online()");
-        return ddf_fun_online(fun);
+	ddf_msg(LVL_DEBUG, "adb_kbd_fun_online()");
+	return ddf_fun_online(fun);
 }
 
 static errno_t adb_kbd_fun_offline(ddf_fun_t *fun)
 {
-        ddf_msg(LVL_DEBUG, "adb_kbd_fun_offline()");
-        return ddf_fun_offline(fun);
+	ddf_msg(LVL_DEBUG, "adb_kbd_fun_offline()");
+	return ddf_fun_offline(fun);
 }
 
Index: uspace/drv/hid/adb-mouse/main.c
===================================================================
--- uspace/drv/hid/adb-mouse/main.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/drv/hid/adb-mouse/main.c	(revision 2c4e1cc2aa4f1a4b249af5c661e93ac170ba5158)
@@ -65,5 +65,5 @@
 	adb_mouse_t *adb_mouse;
 
-        ddf_msg(LVL_DEBUG, "adb_mouse_dev_add(%p)", dev);
+	ddf_msg(LVL_DEBUG, "adb_mouse_dev_add(%p)", dev);
 	adb_mouse = ddf_dev_data_alloc(dev, sizeof(adb_mouse_t));
 	if (adb_mouse == NULL) {
@@ -79,30 +79,30 @@
 static errno_t adb_mouse_dev_remove(ddf_dev_t *dev)
 {
-        adb_mouse_t *adb_mouse = (adb_mouse_t *)ddf_dev_data_get(dev);
+	adb_mouse_t *adb_mouse = (adb_mouse_t *)ddf_dev_data_get(dev);
 
-        ddf_msg(LVL_DEBUG, "adb_mouse_dev_remove(%p)", dev);
+	ddf_msg(LVL_DEBUG, "adb_mouse_dev_remove(%p)", dev);
 
-        return adb_mouse_remove(adb_mouse);
+	return adb_mouse_remove(adb_mouse);
 }
 
 static errno_t adb_mouse_dev_gone(ddf_dev_t *dev)
 {
-        adb_mouse_t *adb_mouse = (adb_mouse_t *)ddf_dev_data_get(dev);
+	adb_mouse_t *adb_mouse = (adb_mouse_t *)ddf_dev_data_get(dev);
 
-        ddf_msg(LVL_DEBUG, "adb_mouse_dev_gone(%p)", dev);
+	ddf_msg(LVL_DEBUG, "adb_mouse_dev_gone(%p)", dev);
 
-        return adb_mouse_gone(adb_mouse);
+	return adb_mouse_gone(adb_mouse);
 }
 
 static errno_t adb_mouse_fun_online(ddf_fun_t *fun)
 {
-        ddf_msg(LVL_DEBUG, "adb_mouse_fun_online()");
-        return ddf_fun_online(fun);
+	ddf_msg(LVL_DEBUG, "adb_mouse_fun_online()");
+	return ddf_fun_online(fun);
 }
 
 static errno_t adb_mouse_fun_offline(ddf_fun_t *fun)
 {
-        ddf_msg(LVL_DEBUG, "adb_mouse_fun_offline()");
-        return ddf_fun_offline(fun);
+	ddf_msg(LVL_DEBUG, "adb_mouse_fun_offline()");
+	return ddf_fun_offline(fun);
 }
 
Index: uspace/drv/hid/atkbd/main.c
===================================================================
--- uspace/drv/hid/atkbd/main.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/drv/hid/atkbd/main.c	(revision 2c4e1cc2aa4f1a4b249af5c661e93ac170ba5158)
@@ -100,5 +100,5 @@
 		ddf_msg(LVL_ERROR, "Failed to initialize AT_KBD driver: %s.",
 		    str_error(rc));
-    		return rc;
+		return rc;
 	}
 
Index: uspace/drv/hid/usbhid/main.c
===================================================================
--- uspace/drv/hid/usbhid/main.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/drv/hid/usbhid/main.c	(revision 2c4e1cc2aa4f1a4b249af5c661e93ac170ba5158)
@@ -162,7 +162,7 @@
 /** The driver itself. */
 static const usb_driver_t usb_hid_driver = {
-        .name = NAME,
-        .ops = &usb_hid_driver_ops,
-        .endpoints = usb_hid_endpoints
+	.name = NAME,
+	.ops = &usb_hid_driver_ops,
+	.endpoints = usb_hid_endpoints
 };
 
Index: uspace/drv/hid/usbhid/subdrivers.c
===================================================================
--- uspace/drv/hid/usbhid/subdrivers.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/drv/hid/usbhid/subdrivers.c	(revision 2c4e1cc2aa4f1a4b249af5c661e93ac170ba5158)
@@ -48,5 +48,5 @@
 		USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD
 	},
-	{0, 0}
+	{ 0, 0 }
 };
 
@@ -56,5 +56,5 @@
 		USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE
 	},
-	{0, 0}
+	{ 0, 0 }
 };
 
@@ -64,5 +64,5 @@
 		USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL
 	},
-	{0, 0}
+	{ 0, 0 }
 };
 
Index: uspace/drv/hid/xtkbd/main.c
===================================================================
--- uspace/drv/hid/xtkbd/main.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/drv/hid/xtkbd/main.c	(revision 2c4e1cc2aa4f1a4b249af5c661e93ac170ba5158)
@@ -100,5 +100,5 @@
 		ddf_msg(LVL_ERROR, "Failed to initialize XT_KBD driver: %s.",
 		    str_error(rc));
-    		return rc;
+		return rc;
 	}