Index: uspace/drv/bus/usb/usbhid/main.c
===================================================================
--- uspace/drv/bus/usb/usbhid/main.c	(revision 9871bca9f00dfd31e49b96d793d88a519edb95fb)
+++ uspace/drv/bus/usb/usbhid/main.c	(revision fbe148ee3735664ea35954a309d7dbabc6164d7c)
@@ -46,6 +46,4 @@
 #include "usbhid.h"
 
-/*----------------------------------------------------------------------------*/
-
 #define NAME "usbhid"
 
@@ -67,9 +65,5 @@
  *
  * @param dev Device to add.
- *
- * @retval EOK if successful.
- * @retval ENOMEM if there
- * @return Other error code inherited from one of functions usb_kbd_init(),
- *         ddf_fun_bind() and ddf_fun_add_to_class().
+ * @return Error code.
  */
 static int usb_hid_try_add_device(usb_device_t *dev)
@@ -138,5 +132,4 @@
 	return EOK;
 }
-
 /*----------------------------------------------------------------------------*/
 /**
@@ -146,7 +139,5 @@
  *
  * @param dev Structure representing the new device.
- *
- * @retval EOK if successful. 
- * @retval EREFUSED if the device is not supported.
+ * @return Error code.
  */
 static int usb_hid_device_add(usb_device_t *dev)
@@ -179,14 +170,21 @@
 	return EOK;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
+/**
+ * Callback for a device about to be removed from the driver.
+ *
+ * @param dev Structure representing the device.
+ * @return Error code.
+ */
+static int usb_hid_device_rem(usb_device_t *dev)
+{
+	return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /**
  * Callback for removing a device from the driver.
  *
  * @param dev Structure representing the device.
- *
- * @retval EOK if successful. 
- * @retval EREFUSED if the device is not supported.
+ * @return Error code.
  */
 static int usb_hid_device_gone(usb_device_t *dev)
@@ -198,5 +196,5 @@
 		if (!tries--) {
 			usb_log_error("Can't remove hub, still running.\n");
-			return EINPROGRESS;
+			return EBUSY;
 		}
 	}
@@ -207,21 +205,19 @@
 	return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** USB generic driver callbacks */
-static usb_driver_ops_t usb_hid_driver_ops = {
+static const usb_driver_ops_t usb_hid_driver_ops = {
 	.device_add = usb_hid_device_add,
+	.device_rem = usb_hid_device_rem,
 	.device_gone = usb_hid_device_gone,
 };
-
-
+/*----------------------------------------------------------------------------*/
 /** The driver itself. */
-static usb_driver_t usb_hid_driver = {
+static const usb_driver_t usb_hid_driver = {
         .name = NAME,
         .ops = &usb_hid_driver_ops,
         .endpoints = usb_hid_endpoints
 };
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 int main(int argc, char *argv[])
 {
@@ -232,5 +228,4 @@
 	return usb_driver_main(&usb_hid_driver);
 }
-
 /**
  * @}