Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/drv/generic/driver.c	(revision b7fd2a02e4161f4edd38548e7f8456b8021549be)
@@ -124,5 +124,5 @@
 	
 	char *dev_name = NULL;
-	int rc = async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0);
+	errno_t rc = async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0);
 	if (rc != EOK) {
 		async_answer_0(iid, rc);
@@ -157,5 +157,5 @@
 	(void) parent_fun_handle;
 	
-	int res = driver->driver_ops->dev_add(dev);
+	errno_t res = driver->driver_ops->dev_add(dev);
 	
 	if (res != EOK) {
@@ -189,5 +189,5 @@
 	}
 	
-	int rc;
+	errno_t rc;
 	
 	if (driver->driver_ops->dev_remove != NULL)
@@ -217,5 +217,5 @@
 	}
 	
-	int rc;
+	errno_t rc;
 	
 	if (driver->driver_ops->dev_gone != NULL)
@@ -253,5 +253,5 @@
 	
 	/* Call driver entry point */
-	int rc;
+	errno_t rc;
 	
 	if (driver->driver_ops->fun_online != NULL)
@@ -288,5 +288,5 @@
 	
 	/* Call driver entry point */
-	int rc;
+	errno_t rc;
 	
 	if (driver->driver_ops->fun_offline != NULL)
@@ -404,5 +404,5 @@
 	 */
 	
-	int ret = EOK;
+	errno_t ret = EOK;
 	/* Open device function */
 	if (fun->ops != NULL && fun->ops->open != NULL)
@@ -666,5 +666,5 @@
  * @return	EOK on success, ENOMEM if out of memory
  */
-int ddf_fun_set_name(ddf_fun_t *dev, const char *name)
+errno_t ddf_fun_set_name(ddf_fun_t *dev, const char *name)
 {
 	assert(dev->name == NULL);
@@ -815,5 +815,5 @@
  *
  */
-int ddf_fun_bind(ddf_fun_t *fun)
+errno_t ddf_fun_bind(ddf_fun_t *fun)
 {
 	assert(fun->bound == false);
@@ -822,5 +822,5 @@
 	
 	add_to_functions_list(fun);
-	int res = devman_add_function(fun->name, fun->ftype, &fun->match_ids,
+	errno_t res = devman_add_function(fun->name, fun->ftype, &fun->match_ids,
 	    fun->dev->handle, &fun->handle);
 	if (res != EOK) {
@@ -843,9 +843,9 @@
  *
  */
-int ddf_fun_unbind(ddf_fun_t *fun)
+errno_t ddf_fun_unbind(ddf_fun_t *fun)
 {
 	assert(fun->bound == true);
 	
-	int res = devman_remove_function(fun->handle);
+	errno_t res = devman_remove_function(fun->handle);
 	if (res != EOK)
 		return res;
@@ -864,9 +864,9 @@
  *
  */
-int ddf_fun_online(ddf_fun_t *fun)
+errno_t ddf_fun_online(ddf_fun_t *fun)
 {
 	assert(fun->bound == true);
 	
-	int res = devman_drv_fun_online(fun->handle);
+	errno_t res = devman_drv_fun_online(fun->handle);
 	if (res != EOK)
 		return res;
@@ -882,9 +882,9 @@
  *
  */
-int ddf_fun_offline(ddf_fun_t *fun)
+errno_t ddf_fun_offline(ddf_fun_t *fun)
 {
 	assert(fun->bound == true);
 	
-	int res = devman_drv_fun_offline(fun->handle);
+	errno_t res = devman_drv_fun_offline(fun->handle);
 	if (res != EOK)
 		return res;
@@ -906,5 +906,5 @@
  *
  */
-int ddf_fun_add_match_id(ddf_fun_t *fun, const char *match_id_str,
+errno_t ddf_fun_add_match_id(ddf_fun_t *fun, const char *match_id_str,
     int match_score)
 {
@@ -953,5 +953,5 @@
  *
  */
-int ddf_fun_add_to_category(ddf_fun_t *fun, const char *cat_name)
+errno_t ddf_fun_add_to_category(ddf_fun_t *fun, const char *cat_name)
 {
 	assert(fun->bound == true);
@@ -974,5 +974,5 @@
 	 */
 	port_id_t port;
-	int rc = async_create_port(INTERFACE_DDF_DRIVER, driver_connection_driver,
+	errno_t rc = async_create_port(INTERFACE_DDF_DRIVER, driver_connection_driver,
 	    NULL, &port);
 	if (rc != EOK) {