Index: uspace/drv/root/root/root.c
===================================================================
--- uspace/drv/root/root/root.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/drv/root/root/root.c	(revision 46577995860f76c247274a43eb6f67b944f0d3a8)
@@ -64,7 +64,7 @@
 #define VIRTUAL_FUN_MATCH_SCORE 100
 
-static int root_dev_add(ddf_dev_t *dev);
-static int root_fun_online(ddf_fun_t *fun);
-static int root_fun_offline(ddf_fun_t *fun);
+static errno_t root_dev_add(ddf_dev_t *dev);
+static errno_t root_fun_online(ddf_fun_t *fun);
+static errno_t root_fun_offline(ddf_fun_t *fun);
 
 /** The root device driver's standard operations. */
@@ -86,9 +86,9 @@
  * @return	EOK on success or an error code
  */
-static int add_virtual_root_fun(ddf_dev_t *dev)
+static errno_t add_virtual_root_fun(ddf_dev_t *dev)
 {
 	const char *name = VIRTUAL_FUN_NAME;
 	ddf_fun_t *fun;
-	int rc;
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, "Adding new function for virtual devices. "
@@ -127,5 +127,5 @@
  * @return	EOK on success or an error code
  */
-static int add_platform_fun(ddf_dev_t *dev)
+static errno_t add_platform_fun(ddf_dev_t *dev)
 {
 	char *match_id;
@@ -135,5 +135,5 @@
 	const char *name = PLATFORM_FUN_NAME;
 	ddf_fun_t *fun;
-	int rc;
+	errno_t rc;
 
 	/* Get platform name from sysinfo. */
@@ -201,5 +201,5 @@
  *			of HW and pseudo devices).
  */
-static int root_dev_add(ddf_dev_t *dev)
+static errno_t root_dev_add(ddf_dev_t *dev)
 {
 	ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun,
@@ -211,5 +211,5 @@
 	 * vital for the system.
 	 */
-	int res = add_virtual_root_fun(dev);
+	errno_t res = add_virtual_root_fun(dev);
 	if (res != EOK)
 		ddf_msg(LVL_WARN, "Failed to add virtual child.");
@@ -223,5 +223,5 @@
 }
 
-static int root_fun_online(ddf_fun_t *fun)
+static errno_t root_fun_online(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "root_fun_online()");
@@ -229,5 +229,5 @@
 }
 
-static int root_fun_offline(ddf_fun_t *fun)
+static errno_t root_fun_offline(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "root_fun_offline()");
Index: uspace/drv/root/virt/virt.c
===================================================================
--- uspace/drv/root/virt/virt.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/drv/root/virt/virt.c	(revision 46577995860f76c247274a43eb6f67b944f0d3a8)
@@ -62,8 +62,8 @@
 };
 
-static int virt_dev_add(ddf_dev_t *dev);
-static int virt_dev_remove(ddf_dev_t *dev);
-static int virt_fun_online(ddf_fun_t *fun);
-static int virt_fun_offline(ddf_fun_t *fun);
+static errno_t virt_dev_add(ddf_dev_t *dev);
+static errno_t virt_dev_remove(ddf_dev_t *dev);
+static errno_t virt_fun_online(ddf_fun_t *fun);
+static errno_t virt_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t virt_ops = {
@@ -100,10 +100,10 @@
  * @return		EOK on success or an error code.
  */
-static int virt_add_fun(virt_t *virt, virtual_function_t *vfun)
+static errno_t virt_add_fun(virt_t *virt, virtual_function_t *vfun)
 {
 	ddf_dev_t *vdev = virt->dev;
 	ddf_fun_t *fun;
 	virt_fun_t *rvfun;
-	int rc;
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, "Registering function `%s' (match \"%s\")",
@@ -148,7 +148,7 @@
 }
 
-static int virt_fun_remove(virt_fun_t *rvfun)
-{
-	int rc;
+static errno_t virt_fun_remove(virt_fun_t *rvfun)
+{
+	errno_t rc;
 	const char *name = ddf_fun_get_name(rvfun->fun);
 
@@ -172,5 +172,5 @@
 
 
-static int virt_dev_add(ddf_dev_t *dev)
+static errno_t virt_dev_add(ddf_dev_t *dev)
 {
 	virt_t *virt;
@@ -205,8 +205,8 @@
 }
 
-static int virt_dev_remove(ddf_dev_t *dev)
+static errno_t virt_dev_remove(ddf_dev_t *dev)
 {
 	virt_t *virt = (virt_t *)ddf_dev_data_get(dev);
-	int rc;
+	errno_t rc;
 
 	while (!list_empty(&virt->functions)) {
@@ -224,5 +224,5 @@
 }
 
-static int virt_fun_online(ddf_fun_t *fun)
+static errno_t virt_fun_online(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "virt_fun_online()");
@@ -230,5 +230,5 @@
 }
 
-static int virt_fun_offline(ddf_fun_t *fun)
+static errno_t virt_fun_offline(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "virt_fun_offline()");