Index: uspace/drv/bus/usb/usbhid/usbhid.c
===================================================================
--- uspace/drv/bus/usb/usbhid/usbhid.c	(revision 07b9cbae1eb337d8d61f30bac3d2f107bbc42f80)
+++ uspace/drv/bus/usb/usbhid/usbhid.c	(revision f3174909cb9e70d462a649143dd7e1430d9f6400)
@@ -51,6 +51,4 @@
 #include "subdrivers.h"
 
-/*----------------------------------------------------------------------------*/
-
 /* Array of endpoints expected on the device, NULL terminated. */
 const usb_endpoint_description_t *usb_hid_endpoints[] = {
@@ -324,5 +322,4 @@
 	return EOK;
 }
-
 /*----------------------------------------------------------------------------*/
 /*
@@ -429,5 +426,5 @@
 	 */
 	bool ok = false;
-	for (int i = 0; i < hid_dev->subdriver_count; ++i) {
+	for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
 		if (hid_dev->subdrivers[i].init != NULL) {
 			usb_log_debug("Initializing subdriver %d.\n",i);
@@ -494,5 +491,5 @@
 	bool cont = false;
 	/* Continue if at least one of the subdrivers want to continue */
-	for (int i = 0; i < hid_dev->subdriver_count; ++i) {
+	for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
 		if (hid_dev->subdrivers[i].poll != NULL) {
 			cont = cont || hid_dev->subdrivers[i].poll(
@@ -503,7 +500,5 @@
 	return cont;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 void usb_hid_polling_ended_callback(usb_device_t *dev, bool reason, void *arg)
 {
@@ -513,5 +508,5 @@
 	usb_hid_dev_t *hid_dev = arg;
 
-	for (int i = 0; i < hid_dev->subdriver_count; ++i) {
+	for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
 		if (hid_dev->subdrivers[i].poll_end != NULL) {
 			hid_dev->subdrivers[i].poll_end(
@@ -522,19 +517,14 @@
 	hid_dev->running = false;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 void usb_hid_new_report(usb_hid_dev_t *hid_dev)
 {
 	++hid_dev->report_nr;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 int usb_hid_report_number(const usb_hid_dev_t *hid_dev)
 {
 	return hid_dev->report_nr;
 }
-
 /*----------------------------------------------------------------------------*/
 void usb_hid_deinit(usb_hid_dev_t *hid_dev)
@@ -547,5 +537,5 @@
 	    hid_dev->subdrivers, hid_dev->subdriver_count);
 
-	for (int i = 0; i < hid_dev->subdriver_count; ++i) {
+	for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
 		if (hid_dev->subdrivers[i].deinit != NULL) {
 			hid_dev->subdrivers[i].deinit(hid_dev,
Index: uspace/drv/bus/usb/usbhid/usbhid.h
===================================================================
--- uspace/drv/bus/usb/usbhid/usbhid.h	(revision 07b9cbae1eb337d8d61f30bac3d2f107bbc42f80)
+++ uspace/drv/bus/usb/usbhid/usbhid.h	(revision f3174909cb9e70d462a649143dd7e1430d9f6400)
@@ -104,5 +104,5 @@
 
 	/** Index of the polling pipe in usb_hid_endpoints array. */
-	int poll_pipe_index;
+	unsigned poll_pipe_index;
 
 	/** Subdrivers. */
@@ -110,5 +110,5 @@
 
 	/** Number of subdrivers. */
-	int subdriver_count;
+	unsigned subdriver_count;
 
 	/** Report descriptor. */