Index: uspace/drv/block/ata_bd/main.c
===================================================================
--- uspace/drv/block/ata_bd/main.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/drv/block/ata_bd/main.c	(revision 36df27ebb72758daf4d2179e70f231ac0e059a83)
@@ -41,9 +41,9 @@
 #include "main.h"
 
-static int ata_dev_add(ddf_dev_t *dev);
-static int ata_dev_remove(ddf_dev_t *dev);
-static int ata_dev_gone(ddf_dev_t *dev);
-static int ata_fun_online(ddf_fun_t *fun);
-static int ata_fun_offline(ddf_fun_t *fun);
+static errno_t ata_dev_add(ddf_dev_t *dev);
+static errno_t ata_dev_remove(ddf_dev_t *dev);
+static errno_t ata_dev_gone(ddf_dev_t *dev);
+static errno_t ata_fun_online(ddf_fun_t *fun);
+static errno_t ata_fun_offline(ddf_fun_t *fun);
 
 static void ata_bd_connection(ipc_callid_t, ipc_call_t *, void *);
@@ -62,9 +62,9 @@
 };
 
-static int ata_get_res(ddf_dev_t *dev, ata_base_t *ata_res)
+static errno_t ata_get_res(ddf_dev_t *dev, ata_base_t *ata_res)
 {
 	async_sess_t *parent_sess;
 	hw_res_list_parsed_t hw_res;
-	int rc;
+	errno_t rc;
 
 	parent_sess = ddf_dev_parent_sess_get(dev);
@@ -108,9 +108,9 @@
  * @return     EOK on success or an error code.
  */
-static int ata_dev_add(ddf_dev_t *dev)
+static errno_t ata_dev_add(ddf_dev_t *dev)
 {
 	ata_ctrl_t *ctrl;
 	ata_base_t res;
-	int rc;
+	errno_t rc;
 
 	rc = ata_get_res(dev, &res);
@@ -151,8 +151,8 @@
 }
 
-int ata_fun_create(disk_t *disk)
+errno_t ata_fun_create(disk_t *disk)
 {
 	ata_ctrl_t *ctrl = disk->ctrl;
-	int rc;
+	errno_t rc;
 	char *fun_name = NULL;
 	ddf_fun_t *fun = NULL;
@@ -212,7 +212,7 @@
 }
 
-int ata_fun_remove(disk_t *disk)
-{
-	int rc;
+errno_t ata_fun_remove(disk_t *disk)
+{
+	errno_t rc;
 	char *fun_name;
 
@@ -250,7 +250,7 @@
 }
 
-int ata_fun_unbind(disk_t *disk)
-{
-	int rc;
+errno_t ata_fun_unbind(disk_t *disk)
+{
+	errno_t rc;
 	char *fun_name;
 
@@ -282,5 +282,5 @@
 }
 
-static int ata_dev_remove(ddf_dev_t *dev)
+static errno_t ata_dev_remove(ddf_dev_t *dev)
 {
 	ata_ctrl_t *ctrl = (ata_ctrl_t *)ddf_dev_data_get(dev);
@@ -291,5 +291,5 @@
 }
 
-static int ata_dev_gone(ddf_dev_t *dev)
+static errno_t ata_dev_gone(ddf_dev_t *dev)
 {
 	ata_ctrl_t *ctrl = (ata_ctrl_t *)ddf_dev_data_get(dev);
@@ -300,5 +300,5 @@
 }
 
-static int ata_fun_online(ddf_fun_t *fun)
+static errno_t ata_fun_online(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "ata_fun_online()");
@@ -306,5 +306,5 @@
 }
 
-static int ata_fun_offline(ddf_fun_t *fun)
+static errno_t ata_fun_offline(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "ata_fun_offline()");