Index: uspace/drv/test/test1/test1.c
===================================================================
--- uspace/drv/test/test1/test1.c	(revision 74017cef2e4edaf9405cf38ba4b0958f664e700c)
+++ uspace/drv/test/test1/test1.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -40,9 +40,9 @@
 #include "test1.h"
 
-static int test1_dev_add(ddf_dev_t *dev);
-static int test1_dev_remove(ddf_dev_t *dev);
-static int test1_dev_gone(ddf_dev_t *dev);
-static int test1_fun_online(ddf_fun_t *fun);
-static int test1_fun_offline(ddf_fun_t *fun);
+static errno_t test1_dev_add(ddf_dev_t *dev);
+static errno_t test1_dev_remove(ddf_dev_t *dev);
+static errno_t test1_dev_gone(ddf_dev_t *dev);
+static errno_t test1_fun_online(ddf_fun_t *fun);
+static errno_t test1_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t driver_ops = {
@@ -73,10 +73,10 @@
  * @param score Device match score.
  */
-static int register_fun_verbose(ddf_dev_t *parent, const char *message,
+static errno_t register_fun_verbose(ddf_dev_t *parent, const char *message,
     const char *name, const char *match_id, int match_score,
-    int expected_rc, ddf_fun_t **pfun)
+    errno_t expected_rc, ddf_fun_t **pfun)
 {
 	ddf_fun_t *fun = NULL;
-	int rc;
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, "Registering function `%s': %s.", name, message);
@@ -141,10 +141,10 @@
  * @return Error code reporting success of the operation.
  */
-static int test1_dev_add(ddf_dev_t *dev)
+static errno_t test1_dev_add(ddf_dev_t *dev)
 {
 	ddf_fun_t *fun_a;
 	test1_t *test1;
 	const char *dev_name;
-	int rc;
+	errno_t rc;
 
 	dev_name = ddf_dev_get_name(dev);
@@ -196,7 +196,7 @@
 }
 
-static int fun_remove(ddf_fun_t *fun, const char *name)
-{
-	int rc;
+static errno_t fun_remove(ddf_fun_t *fun, const char *name)
+{
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, "fun_remove(%p, '%s')", fun, name);
@@ -217,7 +217,7 @@
 }
 
-static int fun_unbind(ddf_fun_t *fun, const char *name)
-{
-	int rc;
+static errno_t fun_unbind(ddf_fun_t *fun, const char *name)
+{
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, "fun_unbind(%p, '%s')", fun, name);
@@ -232,8 +232,8 @@
 }
 
-static int test1_dev_remove(ddf_dev_t *dev)
+static errno_t test1_dev_remove(ddf_dev_t *dev)
 {
 	test1_t *test1 = (test1_t *)ddf_dev_data_get(dev);
-	int rc;
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, "test1_dev_remove(%p)", dev);
@@ -260,8 +260,8 @@
 }
 
-static int test1_dev_gone(ddf_dev_t *dev)
+static errno_t test1_dev_gone(ddf_dev_t *dev)
 {
 	test1_t *test1 = (test1_t *)ddf_dev_data_get(dev);
-	int rc;
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, "test1_dev_remove(%p)", dev);
@@ -288,5 +288,5 @@
 }
 
-static int test1_fun_online(ddf_fun_t *fun)
+static errno_t test1_fun_online(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "test1_fun_online()");
@@ -294,5 +294,5 @@
 }
 
-static int test1_fun_offline(ddf_fun_t *fun)
+static errno_t test1_fun_offline(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "test1_fun_offline()");