Index: uspace/drv/block/ahci/ahci.c
===================================================================
--- uspace/drv/block/ahci/ahci.c	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/ahci/ahci.c	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -109,14 +109,14 @@
 	}
 
-static int get_sata_device_name(ddf_fun_t *, size_t, char *);
-static int get_num_blocks(ddf_fun_t *, uint64_t *);
-static int get_block_size(ddf_fun_t *, size_t *);
-static int read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
-static int write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
-
-static int ahci_identify_device(sata_dev_t *);
-static int ahci_set_highest_ultra_dma_mode(sata_dev_t *);
-static int ahci_rb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
-static int ahci_wb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
+static errno_t get_sata_device_name(ddf_fun_t *, size_t, char *);
+static errno_t get_num_blocks(ddf_fun_t *, uint64_t *);
+static errno_t get_block_size(ddf_fun_t *, size_t *);
+static errno_t read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
+static errno_t write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
+
+static errno_t ahci_identify_device(sata_dev_t *);
+static errno_t ahci_set_highest_ultra_dma_mode(sata_dev_t *);
+static errno_t ahci_rb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
+static errno_t ahci_wb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
 
 static void ahci_sata_devices_create(ahci_dev_t *, ddf_dev_t *);
@@ -124,5 +124,5 @@
 static void ahci_ahci_hw_start(ahci_dev_t *);
 
-static int ahci_dev_add(ddf_dev_t *);
+static errno_t ahci_dev_add(ddf_dev_t *);
 
 static void ahci_get_model_name(uint16_t *, char *);
@@ -177,5 +177,5 @@
  *
  */
-static int get_sata_device_name(ddf_fun_t *fun,
+static errno_t get_sata_device_name(ddf_fun_t *fun,
     size_t sata_dev_name_length, char *sata_dev_name)
 {
@@ -193,5 +193,5 @@
  *
  */
-static int get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
+static errno_t get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
 {
 	sata_dev_t *sata = fun_sata_dev(fun);
@@ -208,5 +208,5 @@
  *
  */
-static int get_block_size(ddf_fun_t *fun, size_t *block_size)
+static errno_t get_block_size(ddf_fun_t *fun, size_t *block_size)
 {
 	sata_dev_t *sata = fun_sata_dev(fun);
@@ -225,5 +225,5 @@
  *
  */
-static int read_blocks(ddf_fun_t *fun, uint64_t blocknum,
+static errno_t read_blocks(ddf_fun_t *fun, uint64_t blocknum,
     size_t count, void *buf)
 {
@@ -232,5 +232,5 @@
 	uintptr_t phys;
 	void *ibuf = AS_AREA_ANY;
-	int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
+	errno_t rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
 	    AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf);
 	if (rc != EOK) {
@@ -268,5 +268,5 @@
  *
  */
-static int write_blocks(ddf_fun_t *fun, uint64_t blocknum,
+static errno_t write_blocks(ddf_fun_t *fun, uint64_t blocknum,
     size_t count, void *buf)
 {
@@ -275,5 +275,5 @@
 	uintptr_t phys;
 	void *ibuf = AS_AREA_ANY;
-	int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
+	errno_t rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
 	    AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf);
 	if (rc != EOK) {
@@ -424,5 +424,5 @@
  *
  */
-static int ahci_identify_device(sata_dev_t *sata)
+static errno_t ahci_identify_device(sata_dev_t *sata)
 {
 	if (sata->is_invalid_device) {
@@ -434,5 +434,5 @@
 	uintptr_t phys;
 	sata_identify_data_t *idata = AS_AREA_ANY;
-	int rc = dmamem_map_anonymous(SATA_IDENTIFY_DEVICE_BUFFER_LENGTH,
+	errno_t rc = dmamem_map_anonymous(SATA_IDENTIFY_DEVICE_BUFFER_LENGTH,
 	    DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
 	    (void *) &idata);
@@ -605,5 +605,5 @@
  *
  */
-static int ahci_set_highest_ultra_dma_mode(sata_dev_t *sata)
+static errno_t ahci_set_highest_ultra_dma_mode(sata_dev_t *sata)
 {
 	if (sata->is_invalid_device) {
@@ -628,5 +628,5 @@
 	uintptr_t phys;
 	sata_identify_data_t *idata = AS_AREA_ANY;
-	int rc = dmamem_map_anonymous(SATA_SET_FEATURE_BUFFER_LENGTH,
+	errno_t rc = dmamem_map_anonymous(SATA_SET_FEATURE_BUFFER_LENGTH,
 	    DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
 	    (void *) &idata);
@@ -734,5 +734,5 @@
  *
  */
-static int ahci_rb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
+static errno_t ahci_rb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
 {
 	if (sata->is_invalid_device) {
@@ -822,5 +822,5 @@
  *
  */
-static int ahci_wb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
+static errno_t ahci_wb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
 {
 	if (sata->is_invalid_device) {
@@ -949,5 +949,5 @@
 	
 	/* Allocate and init retfis structure. */
-	int rc = dmamem_map_anonymous(size, DMAMEM_4GiB,
+	errno_t rc = dmamem_map_anonymous(size, DMAMEM_4GiB,
 	    AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &virt_fb);
 	if (rc != EOK)
@@ -1038,9 +1038,9 @@
  *
  */
-static int ahci_sata_create(ahci_dev_t *ahci, ddf_dev_t *dev,
+static errno_t ahci_sata_create(ahci_dev_t *ahci, ddf_dev_t *dev,
     volatile ahci_port_t *port, unsigned int port_num)
 {
 	ddf_fun_t *fun = NULL;
-	int rc;
+	errno_t rc;
 	
 	sata_dev_t *sata = ahci_sata_allocate(ahci, port);
@@ -1185,5 +1185,5 @@
 	
 	int irq_cap;
-	int rc = register_interrupt_handler(dev,
+	errno_t rc = register_interrupt_handler(dev,
 	    hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
 	if (rc != EOK) {
@@ -1255,5 +1255,5 @@
  *
  */
-static int ahci_dev_add(ddf_dev_t *dev)	
+static errno_t ahci_dev_add(ddf_dev_t *dev)	
 {
 	ahci_dev_t *ahci = ahci_ahci_create(dev);
Index: uspace/drv/block/ata_bd/ata_bd.c
===================================================================
--- uspace/drv/block/ata_bd/ata_bd.c	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/ata_bd/ata_bd.c	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -82,41 +82,41 @@
 static const size_t identify_data_size = 512;
 
-static int ata_bd_init_io(ata_ctrl_t *ctrl);
+static errno_t ata_bd_init_io(ata_ctrl_t *ctrl);
 static void ata_bd_fini_io(ata_ctrl_t *ctrl);
 
-static int ata_bd_open(bd_srvs_t *, bd_srv_t *);
-static int ata_bd_close(bd_srv_t *);
-static int ata_bd_read_blocks(bd_srv_t *, uint64_t ba, size_t cnt, void *buf,
+static errno_t ata_bd_open(bd_srvs_t *, bd_srv_t *);
+static errno_t ata_bd_close(bd_srv_t *);
+static errno_t ata_bd_read_blocks(bd_srv_t *, uint64_t ba, size_t cnt, void *buf,
     size_t);
-static int ata_bd_read_toc(bd_srv_t *, uint8_t session, void *buf, size_t);
-static int ata_bd_write_blocks(bd_srv_t *, uint64_t ba, size_t cnt,
+static errno_t ata_bd_read_toc(bd_srv_t *, uint8_t session, void *buf, size_t);
+static errno_t ata_bd_write_blocks(bd_srv_t *, uint64_t ba, size_t cnt,
     const void *buf, size_t);
-static int ata_bd_get_block_size(bd_srv_t *, size_t *);
-static int ata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
-static int ata_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
-
-static int ata_rcmd_read(disk_t *disk, uint64_t ba, size_t cnt,
+static errno_t ata_bd_get_block_size(bd_srv_t *, size_t *);
+static errno_t ata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t ata_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
+
+static errno_t ata_rcmd_read(disk_t *disk, uint64_t ba, size_t cnt,
     void *buf);
-static int ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
+static errno_t ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
     const void *buf);
-static int ata_rcmd_flush_cache(disk_t *disk);
-static int disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id);
-static int ata_identify_dev(disk_t *disk, void *buf);
-static int ata_identify_pkt_dev(disk_t *disk, void *buf);
-static int ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
+static errno_t ata_rcmd_flush_cache(disk_t *disk);
+static errno_t disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id);
+static errno_t ata_identify_dev(disk_t *disk, void *buf);
+static errno_t ata_identify_pkt_dev(disk_t *disk, void *buf);
+static errno_t ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
     void *obuf, size_t obuf_size, size_t *rcvd_size);
-static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
+static errno_t ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
     size_t *rcvd_size);
-static int ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
+static errno_t ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
     void *obuf, size_t obuf_size);
-static int ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
+static errno_t ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
     size_t *block_size);
-static int ata_pcmd_read_toc(disk_t *disk, uint8_t ses,
+static errno_t ata_pcmd_read_toc(disk_t *disk, uint8_t ses,
     void *obuf, size_t obuf_size);
 static void disk_print_summary(disk_t *d);
-static int coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc);
+static errno_t coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc);
 static void coord_sc_program(ata_ctrl_t *ctrl, const block_coord_t *bc,
     uint16_t scnt);
-static int wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset,
+static errno_t wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset,
     uint8_t *pstatus, unsigned timeout);
 
@@ -143,8 +143,8 @@
 
 /** Initialize ATA controller. */
-int ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res)
+errno_t ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res)
 {
 	int i;
-	int rc;
+	errno_t rc;
 	int n_disks;
 
@@ -209,8 +209,8 @@
 
 /** Remove ATA controller. */
-int ata_ctrl_remove(ata_ctrl_t *ctrl)
+errno_t ata_ctrl_remove(ata_ctrl_t *ctrl)
 {
 	int i;
-	int rc;
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, ": ata_ctrl_remove()");
@@ -234,8 +234,8 @@
 
 /** Surprise removal of ATA controller. */
-int ata_ctrl_gone(ata_ctrl_t *ctrl)
+errno_t ata_ctrl_gone(ata_ctrl_t *ctrl)
 {
 	int i;
-	int rc;
+	errno_t rc;
 
 	ddf_msg(LVL_DEBUG, "ata_ctrl_gone()");
@@ -308,7 +308,7 @@
 
 /** Enable device I/O. */
-static int ata_bd_init_io(ata_ctrl_t *ctrl)
-{
-	int rc;
+static errno_t ata_bd_init_io(ata_ctrl_t *ctrl)
+{
+	errno_t rc;
 	void *vaddr;
 
@@ -344,5 +344,5 @@
  * the disk structure.
  */
-static int disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id)
+static errno_t disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id)
 {
 	identify_data_t idata;
@@ -356,5 +356,5 @@
 	size_t block_size;
 	size_t pos, len;
-	int rc;
+	errno_t rc;
 	unsigned i;
 
@@ -498,10 +498,10 @@
 }
 
-static int ata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
-{
-	return EOK;
-}
-
-static int ata_bd_close(bd_srv_t *bd)
+static errno_t ata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+{
+	return EOK;
+}
+
+static errno_t ata_bd_close(bd_srv_t *bd)
 {
 	return EOK;
@@ -509,9 +509,9 @@
 
 /** Read multiple blocks from the device. */
-static int ata_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
+static errno_t ata_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
     void *buf, size_t size)
 {
 	disk_t *disk = bd_srv_disk(bd);
-	int rc;
+	errno_t rc;
 
 	if (size < cnt * disk->block_size)
@@ -538,5 +538,5 @@
 
 /** Read TOC from device. */
-static int ata_bd_read_toc(bd_srv_t *bd, uint8_t session, void *buf, size_t size)
+static errno_t ata_bd_read_toc(bd_srv_t *bd, uint8_t session, void *buf, size_t size)
 {
 	disk_t *disk = bd_srv_disk(bd);
@@ -546,9 +546,9 @@
 
 /** Write multiple blocks to the device. */
-static int ata_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
+static errno_t ata_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
 	disk_t *disk = bd_srv_disk(bd);
-	int rc;
+	errno_t rc;
 
 	if (disk->dev_type != ata_reg_dev)
@@ -572,5 +572,5 @@
 
 /** Get device block size. */
-static int ata_bd_get_block_size(bd_srv_t *bd, size_t *rbsize)
+static errno_t ata_bd_get_block_size(bd_srv_t *bd, size_t *rbsize)
 {
 	disk_t *disk = bd_srv_disk(bd);
@@ -581,5 +581,5 @@
 
 /** Get device number of blocks. */
-static int ata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+static errno_t ata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
 	disk_t *disk = bd_srv_disk(bd);
@@ -590,5 +590,5 @@
 
 /** Flush cache. */
-static int ata_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
+static errno_t ata_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
 {
 	disk_t *disk = bd_srv_disk(bd);
@@ -602,5 +602,5 @@
 
 /** PIO data-in command protocol. */
-static int ata_pio_data_in(disk_t *disk, void *obuf, size_t obuf_size,
+static errno_t ata_pio_data_in(disk_t *disk, void *obuf, size_t obuf_size,
     size_t blk_size, size_t nblocks)
 {
@@ -633,5 +633,5 @@
 
 /** PIO data-out command protocol. */
-static int ata_pio_data_out(disk_t *disk, const void *buf, size_t buf_size,
+static errno_t ata_pio_data_out(disk_t *disk, const void *buf, size_t buf_size,
     size_t blk_size, size_t nblocks)
 {
@@ -662,5 +662,5 @@
 
 /** PIO non-data command protocol. */
-static int ata_pio_nondata(disk_t *disk)
+static errno_t ata_pio_nondata(disk_t *disk)
 {
 	ata_ctrl_t *ctrl = disk->ctrl;
@@ -687,5 +687,5 @@
  *			not present). EIO if device responds with error.
  */
-static int ata_identify_dev(disk_t *disk, void *buf)
+static errno_t ata_identify_dev(disk_t *disk, void *buf)
 {
 	ata_ctrl_t *ctrl = disk->ctrl;
@@ -739,5 +739,5 @@
  * @param buf		Pointer to a 512-byte buffer.
  */
-static int ata_identify_pkt_dev(disk_t *disk, void *buf)
+static errno_t ata_identify_pkt_dev(disk_t *disk, void *buf)
 {
 	ata_ctrl_t *ctrl = disk->ctrl;
@@ -772,5 +772,5 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
+static errno_t ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
     void *obuf, size_t obuf_size, size_t *rcvd_size)
 {
@@ -860,10 +860,10 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
+static errno_t ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
     size_t *rcvd_size)
 {
 	uint8_t cpb[12];
 	scsi_cdb_inquiry_t *cp = (scsi_cdb_inquiry_t *)cpb;
-	int rc;
+	errno_t rc;
 
 	memset(cpb, 0, sizeof(cpb));
@@ -893,5 +893,5 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
+static errno_t ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
     size_t *block_size)
 {
@@ -899,5 +899,5 @@
 	scsi_read_capacity_10_data_t data;
 	size_t rsize;
-	int rc;
+	errno_t rc;
 
 	memset(&cdb, 0, sizeof(cdb));
@@ -930,9 +930,9 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
+static errno_t ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
     void *obuf, size_t obuf_size)
 {
 	scsi_cdb_read_12_t cp;
-	int rc;
+	errno_t rc;
 
 	if (ba > UINT32_MAX)
@@ -969,10 +969,10 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_pcmd_read_toc(disk_t *disk, uint8_t session, void *obuf,
+static errno_t ata_pcmd_read_toc(disk_t *disk, uint8_t session, void *obuf,
     size_t obuf_size)
 {
 	uint8_t cpb[12];
 	scsi_cdb_read_toc_t *cp = (scsi_cdb_read_toc_t *)cpb;
-	int rc;
+	errno_t rc;
 
 	memset(cpb, 0, sizeof(cpb));
@@ -1001,5 +1001,5 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_rcmd_read(disk_t *disk, uint64_t ba, size_t blk_cnt,
+static errno_t ata_rcmd_read(disk_t *disk, uint64_t ba, size_t blk_cnt,
     void *buf)
 {
@@ -1007,5 +1007,5 @@
 	uint8_t drv_head;
 	block_coord_t bc;
-	int rc;
+	errno_t rc;
 
 	/* Silence warning. */
@@ -1061,5 +1061,5 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
+static errno_t ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
     const void *buf)
 {
@@ -1067,5 +1067,5 @@
 	uint8_t drv_head;
 	block_coord_t bc;
-	int rc;
+	errno_t rc;
 
 	/* Silence warning. */
@@ -1117,9 +1117,9 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_rcmd_flush_cache(disk_t *disk)
+static errno_t ata_rcmd_flush_cache(disk_t *disk)
 {
 	ata_ctrl_t *ctrl = disk->ctrl;
 	uint8_t drv_head;
-	int rc;
+	errno_t rc;
 
 	/* New value for Drive/Head register */
@@ -1159,5 +1159,5 @@
  * @return EOK on success or EINVAL if block index is past end of device.
  */
-static int coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc)
+static errno_t coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc)
 {
 	uint64_t c;
@@ -1246,5 +1246,5 @@
  * @return		EOK on success, EIO on timeout.
  */
-static int wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset,
+static errno_t wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset,
     uint8_t *pstatus, unsigned timeout)
 {
Index: uspace/drv/block/ata_bd/ata_bd.h
===================================================================
--- uspace/drv/block/ata_bd/ata_bd.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/ata_bd/ata_bd.h	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -153,7 +153,7 @@
 } ata_fun_t;
 
-extern int ata_ctrl_init(ata_ctrl_t *, ata_base_t *);
-extern int ata_ctrl_remove(ata_ctrl_t *);
-extern int ata_ctrl_gone(ata_ctrl_t *);
+extern errno_t ata_ctrl_init(ata_ctrl_t *, ata_base_t *);
+extern errno_t ata_ctrl_remove(ata_ctrl_t *);
+extern errno_t ata_ctrl_gone(ata_ctrl_t *);
 
 extern bd_ops_t ata_bd_ops;
Index: uspace/drv/block/ata_bd/main.c
===================================================================
--- uspace/drv/block/ata_bd/main.c	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/ata_bd/main.c	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -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()");
Index: uspace/drv/block/ata_bd/main.h
===================================================================
--- uspace/drv/block/ata_bd/main.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/ata_bd/main.h	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -38,7 +38,7 @@
 #include "ata_bd.h"
 
-extern int ata_fun_create(disk_t *);
-extern int ata_fun_remove(disk_t *);
-extern int ata_fun_unbind(disk_t *);
+extern errno_t ata_fun_create(disk_t *);
+extern errno_t ata_fun_remove(disk_t *);
+extern errno_t ata_fun_unbind(disk_t *);
 
 #endif
Index: uspace/drv/block/ddisk/ddisk.c
===================================================================
--- uspace/drv/block/ddisk/ddisk.c	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/ddisk/ddisk.c	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -56,9 +56,9 @@
 #define DDISK_CMD_IRQ_DEASSERT	0x4
 
-static int ddisk_dev_add(ddf_dev_t *);
-static int ddisk_dev_remove(ddf_dev_t *);
-static int ddisk_dev_gone(ddf_dev_t *);
-static int ddisk_fun_online(ddf_fun_t *);
-static int ddisk_fun_offline(ddf_fun_t *);
+static errno_t ddisk_dev_add(ddf_dev_t *);
+static errno_t ddisk_dev_remove(ddf_dev_t *);
+static errno_t ddisk_dev_gone(ddf_dev_t *);
+static errno_t ddisk_fun_online(ddf_fun_t *);
+static errno_t ddisk_fun_offline(ddf_fun_t *);
 
 static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
@@ -117,11 +117,11 @@
 } ddisk_t;
 
-static int ddisk_bd_open(bd_srvs_t *, bd_srv_t *);
-static int ddisk_bd_close(bd_srv_t *);
-static int ddisk_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
-static int ddisk_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *,
+static errno_t ddisk_bd_open(bd_srvs_t *, bd_srv_t *);
+static errno_t ddisk_bd_close(bd_srv_t *);
+static errno_t ddisk_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
+static errno_t ddisk_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *,
     size_t);
-static int ddisk_bd_get_block_size(bd_srv_t *, size_t *);
-static int ddisk_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t ddisk_bd_get_block_size(bd_srv_t *, size_t *);
+static errno_t ddisk_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
 
 bd_ops_t ddisk_bd_ops = {
@@ -188,10 +188,10 @@
 }
 
-int ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
-{
-	return EOK;
-}
-
-int ddisk_bd_close(bd_srv_t *bd)
+errno_t ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+{
+	return EOK;
+}
+
+errno_t ddisk_bd_close(bd_srv_t *bd)
 {
 	return EOK;
@@ -199,5 +199,5 @@
 
 static
-int ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf)
+errno_t ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf)
 {
 	fibril_mutex_lock(&ddisk->lock);
@@ -236,10 +236,10 @@
 
 static
-int ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+errno_t ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
     size_t size, bool is_read)
 {
 	ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg;
 	aoff64_t i;
-	int rc;
+	errno_t rc;
 
 	if (size < cnt * DDISK_BLOCK_SIZE)
@@ -256,5 +256,5 @@
 }
 
-int ddisk_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+errno_t ddisk_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
     size_t size)
 {
@@ -262,5 +262,5 @@
 }
 
-int ddisk_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+errno_t ddisk_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
@@ -268,5 +268,5 @@
 }
 
-int ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+errno_t ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
 	*rsize = DDISK_BLOCK_SIZE; 
@@ -274,5 +274,5 @@
 }
 
-int ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+errno_t ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
 	ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg;
@@ -282,9 +282,9 @@
 }
 
-static int ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_res)
+static errno_t ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_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);
@@ -317,7 +317,7 @@
 }
 
-static int ddisk_fun_create(ddisk_t *ddisk)
-{
-	int rc;
+static errno_t ddisk_fun_create(ddisk_t *ddisk)
+{
+	errno_t rc;
 	ddf_fun_t *fun = NULL;
 
@@ -350,7 +350,7 @@
 }
 
-static int ddisk_fun_remove(ddisk_t *ddisk)
-{
-	int rc;
+static errno_t ddisk_fun_remove(ddisk_t *ddisk)
+{
+	errno_t rc;
 
 	if (ddisk->fun == NULL)
@@ -381,7 +381,7 @@
 }
 
-static int ddisk_fun_unbind(ddisk_t *ddisk)
-{
-	int rc;
+static errno_t ddisk_fun_unbind(ddisk_t *ddisk)
+{
+	errno_t rc;
 
 	if (ddisk->fun == NULL)
@@ -410,9 +410,9 @@
  * @return     EOK on success or an error code.
  */
-static int ddisk_dev_add(ddf_dev_t *dev)
+static errno_t ddisk_dev_add(ddf_dev_t *dev)
 {
 	ddisk_t *ddisk;
 	ddisk_res_t res;
-	int rc;
+	errno_t rc;
 
 	/*
@@ -530,7 +530,7 @@
 
 
-static int ddisk_dev_remove_common(ddisk_t *ddisk, bool surprise)
-{
-	int rc;
+static errno_t ddisk_dev_remove_common(ddisk_t *ddisk, bool surprise)
+{
+	errno_t rc;
 
 	if (!surprise)
@@ -558,5 +558,5 @@
 }
 
-static int ddisk_dev_remove(ddf_dev_t *dev)
+static errno_t ddisk_dev_remove(ddf_dev_t *dev)
 {
 	ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
@@ -566,5 +566,5 @@
 }
 
-static int ddisk_dev_gone(ddf_dev_t *dev)
+static errno_t ddisk_dev_gone(ddf_dev_t *dev)
 {
 	ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
@@ -574,5 +574,5 @@
 }
 
-static int ddisk_fun_online(ddf_fun_t *fun)
+static errno_t ddisk_fun_online(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "ddisk_fun_online()");
@@ -580,5 +580,5 @@
 }
 
-static int ddisk_fun_offline(ddf_fun_t *fun)
+static errno_t ddisk_fun_offline(ddf_fun_t *fun)
 {
 	ddf_msg(LVL_DEBUG, "ddisk_fun_offline()");
Index: uspace/drv/block/usbmast/bo_trans.c
===================================================================
--- uspace/drv/block/usbmast/bo_trans.c	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/usbmast/bo_trans.c	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -58,7 +58,7 @@
  * @return		Error code
  */
-int usb_massstor_cmd(usbmast_fun_t *mfun, uint32_t tag, scsi_cmd_t *cmd)
-{
-	int rc;
+errno_t usb_massstor_cmd(usbmast_fun_t *mfun, uint32_t tag, scsi_cmd_t *cmd)
+{
+	errno_t rc;
 
 	if (cmd->data_in && cmd->data_out)
@@ -192,5 +192,5 @@
  * @return		Error code
  */
-int usb_massstor_reset(usbmast_dev_t *mdev)
+errno_t usb_massstor_reset(usbmast_dev_t *mdev)
 {
 	return usb_control_request_set(
@@ -234,5 +234,5 @@
 	uint8_t max_lun;
 	size_t data_recv_len;
-	int rc = usb_control_request_get(
+	errno_t rc = usb_control_request_get(
 	    usb_device_get_default_pipe(mdev->usb_dev),
 	    USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
Index: uspace/drv/block/usbmast/bo_trans.h
===================================================================
--- uspace/drv/block/usbmast/bo_trans.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/usbmast/bo_trans.h	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -86,6 +86,6 @@
 } scsi_cmd_t;
 
-extern int usb_massstor_cmd(usbmast_fun_t *, uint32_t, scsi_cmd_t *);
-extern int usb_massstor_reset(usbmast_dev_t *);
+extern errno_t usb_massstor_cmd(usbmast_fun_t *, uint32_t, scsi_cmd_t *);
+extern errno_t usb_massstor_reset(usbmast_dev_t *);
 extern void usb_massstor_reset_recovery(usbmast_dev_t *);
 extern int usb_massstor_get_max_lun(usbmast_dev_t *);
Index: uspace/drv/block/usbmast/main.c
===================================================================
--- uspace/drv/block/usbmast/main.c	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/usbmast/main.c	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -77,15 +77,15 @@
 };
 
-static int usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun);
+static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun);
 static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
     void *arg);
 
-static int usbmast_bd_open(bd_srvs_t *, bd_srv_t *);
-static int usbmast_bd_close(bd_srv_t *);
-static int usbmast_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
-static int usbmast_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
-static int usbmast_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
-static int usbmast_bd_get_block_size(bd_srv_t *, size_t *);
-static int usbmast_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t usbmast_bd_open(bd_srvs_t *, bd_srv_t *);
+static errno_t usbmast_bd_close(bd_srv_t *);
+static errno_t usbmast_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
+static errno_t usbmast_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
+static errno_t usbmast_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
+static errno_t usbmast_bd_get_block_size(bd_srv_t *, size_t *);
+static errno_t usbmast_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
 
 static bd_ops_t usbmast_bd_ops = {
@@ -109,5 +109,5 @@
  * @return Error code.
  */
-static int usbmast_device_gone(usb_device_t *dev)
+static errno_t usbmast_device_gone(usb_device_t *dev)
 {
 	usbmast_dev_t *mdev = usb_device_data_get(dev);
@@ -115,5 +115,5 @@
 
 	for (size_t i = 0; i < mdev->lun_count; ++i) {
-		const int rc = ddf_fun_unbind(mdev->luns[i]);
+		const errno_t rc = ddf_fun_unbind(mdev->luns[i]);
 		if (rc != EOK) {
 			usb_log_error("Failed to unbind LUN function %zu: "
@@ -133,5 +133,5 @@
  * @return Error code.
  */
-static int usbmast_device_remove(usb_device_t *dev)
+static errno_t usbmast_device_remove(usb_device_t *dev)
 {
 	//TODO: flush buffers, or whatever.
@@ -145,7 +145,7 @@
  * @return Error code.
  */
-static int usbmast_device_add(usb_device_t *dev)
-{
-	int rc;
+static errno_t usbmast_device_add(usb_device_t *dev)
+{
+	errno_t rc;
 	usbmast_dev_t *mdev = NULL;
 	unsigned i;
@@ -198,5 +198,5 @@
 		if (mdev->luns[i] == NULL)
 			continue;
-		const int rc = ddf_fun_unbind(mdev->luns[i]);
+		const errno_t rc = ddf_fun_unbind(mdev->luns[i]);
 		if (rc != EOK) {
 			usb_log_warning("Failed to unbind LUN function %zu: "
@@ -217,7 +217,7 @@
  * @return		EOK on success or an error code.
  */
-static int usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun)
-{
-	int rc;
+static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun)
+{
+	errno_t rc;
 	char *fun_name = NULL;
 	ddf_fun_t *fun = NULL;
@@ -326,5 +326,5 @@
 
 /** Open device. */
-static int usbmast_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static errno_t usbmast_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
 	return EOK;
@@ -332,5 +332,5 @@
 
 /** Close device. */
-static int usbmast_bd_close(bd_srv_t *bd)
+static errno_t usbmast_bd_close(bd_srv_t *bd)
 {
 	return EOK;
@@ -338,5 +338,5 @@
 
 /** Read blocks from the device. */
-static int usbmast_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, void *buf,
+static errno_t usbmast_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, void *buf,
     size_t size)
 {
@@ -350,5 +350,5 @@
 
 /** Synchronize blocks to nonvolatile storage. */
-static int usbmast_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
+static errno_t usbmast_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
 {
 	usbmast_fun_t *mfun = bd_srv_usbmast(bd);
@@ -358,5 +358,5 @@
 
 /** Write blocks to the device. */
-static int usbmast_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
+static errno_t usbmast_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
@@ -370,5 +370,5 @@
 
 /** Get device block size. */
-static int usbmast_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+static errno_t usbmast_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
 	usbmast_fun_t *mfun = bd_srv_usbmast(bd);
@@ -378,5 +378,5 @@
 
 /** Get number of blocks on device. */
-static int usbmast_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+static errno_t usbmast_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
 	usbmast_fun_t *mfun = bd_srv_usbmast(bd);
Index: uspace/drv/block/usbmast/scsi_ms.c
===================================================================
--- uspace/drv/block/usbmast/scsi_ms.c	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/usbmast/scsi_ms.c	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -72,9 +72,9 @@
 }
 
-static int usb_massstor_unit_ready(usbmast_fun_t *mfun)
+static errno_t usb_massstor_unit_ready(usbmast_fun_t *mfun)
 {
 	scsi_cmd_t cmd;
 	scsi_cdb_test_unit_ready_t cdb;
-	int rc;
+	errno_t rc;
 
 	memset(&cdb, 0, sizeof(cdb));
@@ -107,9 +107,9 @@
  * XXX This is too simplified.
  */
-static int usbmast_run_cmd(usbmast_fun_t *mfun, scsi_cmd_t *cmd)
+static errno_t usbmast_run_cmd(usbmast_fun_t *mfun, scsi_cmd_t *cmd)
 {
 	uint8_t sense_key;
 	scsi_sense_data_t sense_buf;
-	int rc;
+	errno_t rc;
 
 	do {
@@ -162,10 +162,10 @@
  * @return		Error code
  */
-int usbmast_inquiry(usbmast_fun_t *mfun, usbmast_inquiry_data_t *inq_res)
+errno_t usbmast_inquiry(usbmast_fun_t *mfun, usbmast_inquiry_data_t *inq_res)
 {
 	scsi_std_inquiry_data_t inq_data;
 	scsi_cmd_t cmd;
 	scsi_cdb_inquiry_t cdb;
-	int rc;
+	errno_t rc;
 
 	memset(&cdb, 0, sizeof(cdb));
@@ -231,9 +231,9 @@
  * @return		Error code.
  */
-int usbmast_request_sense(usbmast_fun_t *mfun, void *buf, size_t size)
+errno_t usbmast_request_sense(usbmast_fun_t *mfun, void *buf, size_t size)
 {
 	scsi_cmd_t cmd;
 	scsi_cdb_request_sense_t cdb;
-	int rc;
+	errno_t rc;
 
 	memset(&cdb, 0, sizeof(cdb));
@@ -272,5 +272,5 @@
  * @return		Error code.
  */
-int usbmast_read_capacity(usbmast_fun_t *mfun, uint32_t *nblocks,
+errno_t usbmast_read_capacity(usbmast_fun_t *mfun, uint32_t *nblocks,
     uint32_t *block_size)
 {
@@ -278,5 +278,5 @@
 	scsi_cdb_read_capacity_10_t cdb;
 	scsi_read_capacity_10_data_t data;
-	int rc;
+	errno_t rc;
 
 	memset(&cdb, 0, sizeof(cdb));
@@ -323,9 +323,9 @@
  * @return		Error code
  */
-int usbmast_read(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks, void *buf)
+errno_t usbmast_read(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks, void *buf)
 {
 	scsi_cmd_t cmd;
 	scsi_cdb_read_10_t cdb;
-	int rc;
+	errno_t rc;
 
 	if (ba > UINT32_MAX)
@@ -378,10 +378,10 @@
  * @return		Error code
  */
-int usbmast_write(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks,
+errno_t usbmast_write(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks,
     const void *data)
 {
 	scsi_cmd_t cmd;
 	scsi_cdb_write_10_t cdb;
-	int rc;
+	errno_t rc;
 
 	if (ba > UINT32_MAX)
@@ -428,5 +428,5 @@
  * @return		Error code
  */
-int usbmast_sync_cache(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks)
+errno_t usbmast_sync_cache(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks)
 {
 	if (ba > UINT32_MAX)
@@ -447,5 +447,5 @@
 	};
 
-	const int rc = usbmast_run_cmd(mfun, &cmd);
+	const errno_t rc = usbmast_run_cmd(mfun, &cmd);
 
         if (rc != EOK) {
Index: uspace/drv/block/usbmast/scsi_ms.h
===================================================================
--- uspace/drv/block/usbmast/scsi_ms.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ uspace/drv/block/usbmast/scsi_ms.h	(revision 2b3dd78e52704a51e22b71513327373cf8f6a614)
@@ -60,10 +60,10 @@
 } usbmast_inquiry_data_t;
 
-extern int usbmast_inquiry(usbmast_fun_t *, usbmast_inquiry_data_t *);
-extern int usbmast_request_sense(usbmast_fun_t *, void *, size_t);
-extern int usbmast_read_capacity(usbmast_fun_t *, uint32_t *, uint32_t *);
-extern int usbmast_read(usbmast_fun_t *, uint64_t, size_t, void *);
-extern int usbmast_write(usbmast_fun_t *, uint64_t, size_t, const void *);
-extern int usbmast_sync_cache(usbmast_fun_t *, uint64_t, size_t);
+extern errno_t usbmast_inquiry(usbmast_fun_t *, usbmast_inquiry_data_t *);
+extern errno_t usbmast_request_sense(usbmast_fun_t *, void *, size_t);
+extern errno_t usbmast_read_capacity(usbmast_fun_t *, uint32_t *, uint32_t *);
+extern errno_t usbmast_read(usbmast_fun_t *, uint64_t, size_t, void *);
+extern errno_t usbmast_write(usbmast_fun_t *, uint64_t, size_t, const void *);
+extern errno_t usbmast_sync_cache(usbmast_fun_t *, uint64_t, size_t);
 extern const char *usbmast_scsi_dev_type_str(unsigned);