Index: uspace/drv/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/usbhid/generic/hiddev.c	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/generic/hiddev.c	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -231,10 +231,6 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_generic_hid_polling_callback(usb_hid_dev_t *hid_dev, void *data/*, 
-    uint8_t *buffer, size_t buffer_size*/)
-{
-//	usb_log_debug2("usb_hid_polling_callback(%p, %p, %zu)\n",
-//	    hid_dev, buffer, buffer_size);
-//	usb_debug_str_buffer(buffer, buffer_size, 0);
+bool usb_generic_hid_polling_callback(usb_hid_dev_t *hid_dev, void *data)
+{
 	return true;
 }
Index: uspace/drv/usbhid/generic/hiddev.h
===================================================================
--- uspace/drv/usbhid/generic/hiddev.h	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/generic/hiddev.h	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -50,6 +50,5 @@
 int usb_generic_hid_init(struct usb_hid_dev *hid_dev, void **data);
 
-bool usb_generic_hid_polling_callback(struct usb_hid_dev *hid_dev, void *data/*,
-    uint8_t *buffer, size_t buffer_size*/);
+bool usb_generic_hid_polling_callback(struct usb_hid_dev *hid_dev, void *data);
 
 #endif // USB_HID_HIDDDEV_H_
Index: uspace/drv/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/usbhid/kbd/kbddev.c	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/kbd/kbddev.c	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -434,26 +434,13 @@
  *     usb_hid_parse_report().
  */
-static void usb_kbd_process_data(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev/*,
-                                 uint8_t *buffer, size_t actual_size*/)
+static void usb_kbd_process_data(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev)
 {
 	assert(hid_dev->report != NULL);
 	assert(hid_dev != NULL);
 	assert(kbd_dev != NULL);
-
-//	usb_log_debug("Calling usb_hid_parse_report() with "
-//	    "buffer %s\n", usb_debug_str_buffer(buffer, actual_size, 0));
 	
 	usb_hid_report_path_t *path = usb_hid_report_path();
 	usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
 
-//	uint8_t report_id;
-//	int rc = usb_hid_parse_report(hid_dev->report, buffer, actual_size, 
-//	    &report_id);
-	
-//	if (rc != EOK) {
-//		usb_log_warning("Error in usb_hid_parse_report():"
-//		    "%s\n", str_error(rc));
-//	}
-	
 	usb_hid_report_path_set_report_id (path, hid_dev->report_id);
 	
@@ -756,6 +743,5 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_kbd_polling_callback(usb_hid_dev_t *hid_dev, void *data/*, 
-     uint8_t *buffer, size_t buffer_size*/)
+bool usb_kbd_polling_callback(usb_hid_dev_t *hid_dev, void *data)
 {
 	if (hid_dev == NULL/* || buffer == NULL*/ || data == NULL) {
@@ -768,5 +754,5 @@
 	
 	// TODO: add return value from this function
-	usb_kbd_process_data(hid_dev, kbd_dev/*, buffer, buffer_size*/);
+	usb_kbd_process_data(hid_dev, kbd_dev);
 	
 	return true;
@@ -804,4 +790,6 @@
 	if ((*kbd_dev)->repeat_mtx != NULL) {
 		//assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
+		// FIXME - the fibril_mutex_is_locked may not cause
+		// fibril scheduling
 		while (fibril_mutex_is_locked((*kbd_dev)->repeat_mtx)) {}
 		free((*kbd_dev)->repeat_mtx);
Index: uspace/drv/usbhid/kbd/kbddev.h
===================================================================
--- uspace/drv/usbhid/kbd/kbddev.h	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/kbd/kbddev.h	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -125,6 +125,5 @@
 int usb_kbd_init(struct usb_hid_dev *hid_dev, void **data);
 
-bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, void *data/*, 
-                              uint8_t *buffer, size_t buffer_size*/);
+bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, void *data);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
Index: uspace/drv/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/usbhid/mouse/mousedev.c	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/mouse/mousedev.c	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -229,12 +229,8 @@
 /*----------------------------------------------------------------------------*/
 
-static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev, 
-                                     usb_mouse_t *mouse_dev/*, uint8_t *buffer,
-                                     size_t buffer_size*/)
+static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev,
+    usb_mouse_t *mouse_dev)
 {
 	assert(mouse_dev != NULL);
-	
-//	usb_log_debug2("got buffer: %s.\n",
-//	    usb_debug_str_buffer(buffer, buffer_size, 0));
 	
 	if (mouse_dev->mouse_phone < 0) {
@@ -243,22 +239,4 @@
 	}
 
-	/*
-	 * parse the input report
-	 */
-	
-//	usb_log_debug(NAME " Calling usb_hid_parse_report() with "
-//	    "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 0));
-	
-//	uint8_t report_id;
-	
-//	int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
-//	    &report_id);
-	
-//	if (rc != EOK) {
-//		usb_log_warning(NAME "Error in usb_hid_parse_report(): %s\n", 
-//		    str_error(rc));
-//		return true;
-//	}
-	
 	/*
 	 * X
@@ -510,9 +488,7 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data/*, 
-     uint8_t *buffer, size_t buffer_size*/)
+bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data)
 {
 	usb_log_debug("usb_mouse_polling_callback()\n");
-//	usb_debug_str_buffer(buffer, buffer_size, 0);
 	
 	if (hid_dev == NULL || data == NULL) {
@@ -524,6 +500,5 @@
 	usb_mouse_t *mouse_dev = (usb_mouse_t *)data;
 		
-	return usb_mouse_process_report(hid_dev, mouse_dev/*, buffer, 
-	                                buffer_size*/);
+	return usb_mouse_process_report(hid_dev, mouse_dev);
 }
 
Index: uspace/drv/usbhid/mouse/mousedev.h
===================================================================
--- uspace/drv/usbhid/mouse/mousedev.h	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/mouse/mousedev.h	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -65,6 +65,5 @@
 int usb_mouse_init(struct usb_hid_dev *hid_dev, void **data);
 
-bool usb_mouse_polling_callback(struct usb_hid_dev *hid_dev, void *data/*, 
-    uint8_t *buffer, size_t buffer_size*/);
+bool usb_mouse_polling_callback(struct usb_hid_dev *hid_dev, void *data);
 
 void usb_mouse_deinit(struct usb_hid_dev *hid_dev, void *data);
Index: uspace/drv/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/usbhid/multimedia/multimedia.c	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/multimedia/multimedia.c	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -94,5 +94,4 @@
 	
 	usb_multimedia_t *multim_dev = (usb_multimedia_t *)fun->driver_data;
-	//usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
 	
 	if (multim_dev == NULL) {
@@ -274,34 +273,16 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data/*, 
-    uint8_t *buffer, size_t buffer_size*/)
+bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data)
 {
 	// TODO: checks
-	if (hid_dev == NULL || data == NULL/* || buffer == NULL*/) {
+	if (hid_dev == NULL || data == NULL) {
 		return false;
 	}
-	
-//	usb_log_debug(NAME " usb_lgtch_polling_callback(%p, %p, %zu)\n",
-//	    hid_dev, buffer, buffer_size);
-	
+
 	usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-
-//	usb_log_debug(NAME " Calling usb_hid_parse_report() with "
-//	    "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 0));
 	
 	usb_hid_report_path_t *path = usb_hid_report_path();
 	usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
 
-//	uint8_t report_id;
-	
-//	int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
-//	    &report_id);
-	
-//	if (rc != EOK) {
-//		usb_log_warning(NAME "Error in usb_hid_parse_report(): %s\n", 
-//		    str_error(rc));
-//		return true;
-//	}
-	
 	usb_hid_report_path_set_report_id(path, hid_dev->report_id);
 
Index: uspace/drv/usbhid/multimedia/multimedia.h
===================================================================
--- uspace/drv/usbhid/multimedia/multimedia.h	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/multimedia/multimedia.h	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -47,6 +47,5 @@
 void usb_multimedia_deinit(struct usb_hid_dev *hid_dev, void *data);
 
-bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data/*,
-    uint8_t *buffer, size_t buffer_size*/);
+bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data);
 
 /*----------------------------------------------------------------------------*/
Index: uspace/drv/usbhid/usbhid.c
===================================================================
--- uspace/drv/usbhid/usbhid.c	(revision 98dc29dc22b937ab7f76972d03e6df920eb81e16)
+++ uspace/drv/usbhid/usbhid.c	(revision d37d1b778e0809028489e9e2f4af198a0f308282)
@@ -598,5 +598,5 @@
 		if (hid_dev->subdrivers[i].poll != NULL
 		    && hid_dev->subdrivers[i].poll(hid_dev, 
-		        hid_dev->subdrivers[i].data/*, buffer, buffer_size*/)) {
+		        hid_dev->subdrivers[i].data)) {
 			cont = true;
 		}