Index: uspace/srv/devman/drv_conn.c
===================================================================
--- uspace/srv/devman/drv_conn.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/srv/devman/drv_conn.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -61,5 +61,5 @@
 #include "main.h"
 
-static int init_running_drv(void *drv);
+static errno_t init_running_drv(void *drv);
 
 /** Register running driver. */
@@ -72,5 +72,5 @@
 	
 	/* Get driver name. */
-	int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
+	errno_t rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
 	if (rc != EOK) {
 		async_answer_0(callid, rc);
@@ -163,10 +163,10 @@
  * @return		Zero on success, error code otherwise.
  */
-static int devman_receive_match_id(match_id_list_t *match_ids)
+static errno_t devman_receive_match_id(match_id_list_t *match_ids)
 {
 	match_id_t *match_id = create_match_id();
 	ipc_callid_t callid;
 	ipc_call_t call;
-	int rc = 0;
+	errno_t rc = 0;
 	
 	callid = async_get_call(&call);
@@ -213,8 +213,8 @@
  * @return		Zero on success, error code otherwise.
  */
-static int devman_receive_match_ids(sysarg_t match_count,
+static errno_t devman_receive_match_ids(sysarg_t match_count,
     match_id_list_t *match_ids)
 {
-	int ret = EOK;
+	errno_t ret = EOK;
 	size_t i;
 	
@@ -255,5 +255,5 @@
 	
 	char *fun_name = NULL;
-	int rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
+	errno_t rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
 	if (rc != EOK) {
 		dev_del_ref(pdev);
@@ -332,5 +332,5 @@
 	devman_handle_t handle = IPC_GET_ARG1(*call);
 	category_id_t cat_id;
-	int rc;
+	errno_t rc;
 	
 	/* Get category name. */
@@ -381,5 +381,5 @@
 {
 	fun_node_t *fun;
-	int rc;
+	errno_t rc;
 	
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_drv_fun_online()");
@@ -425,5 +425,5 @@
 {
 	fun_node_t *fun;
-	int rc;
+	errno_t rc;
 
 	fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
@@ -462,5 +462,5 @@
 	devman_handle_t fun_handle = IPC_GET_ARG1(*call);
 	dev_tree_t *tree = &device_tree;
-	int rc;
+	errno_t rc;
 	
 	fun_node_t *fun = find_fun_node(&device_tree, fun_handle);
@@ -490,5 +490,5 @@
 			dev_node_t *dev = fun->child;
 			device_state_t dev_state;
-			int gone_rc;
+			errno_t gone_rc;
 			
 			dev_add_ref(dev);
@@ -575,5 +575,5 @@
  * driver needed to be served by devman during the driver's initialization).
  */
-static int init_running_drv(void *drv)
+static errno_t init_running_drv(void *drv)
 {
 	driver_t *driver = (driver_t *) drv;