Changeset d5c1051 in mainline for uspace/drv/block

Timestamp:

2017-12-20T22:25:34Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

Location:

uspace/drv/block

Files:

• ata_bd/ata_bd.c (modified) (3 diffs)
• usbmast/bo_trans.c (modified) (2 diffs)

uspace/drv/block/ata_bd/ata_bd.c

@@ -145 +145 @@
 int ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res)
 {
-        int i, rc;
+        int i;
+        int rc;
         int n_disks;
 
@@ -210 +211 @@
 int ata_ctrl_remove(ata_ctrl_t *ctrl)
 {
-        int i, rc;
+        int i;
+        int rc;
 
         ddf_msg(LVL_DEBUG, ": ata_ctrl_remove()");
@@ -234 +236 @@
 int ata_ctrl_gone(ata_ctrl_t *ctrl)
 {
-        int i, rc;
+        int i;
+        int rc;
 
         ddf_msg(LVL_DEBUG, "ata_ctrl_gone()");

uspace/drv/block/usbmast/bo_trans.c

@@ -228 +228 @@
  *
  * @param mfun          Mass storage function
- * @return              Error code of maximum LUN (index, not count)
+ * @return              Maximum LUN (index, not count), or -1
  */
 int usb_massstor_get_max_lun(usbmast_dev_t *mdev)
@@ -240 +240 @@
             &data_recv_len);
         if (rc != EOK) {
-                return rc;
+                return -1;
         }
         if (data_recv_len != 1) {
-                return EEMPTY;
-        }
-        return (int) max_lun;
+                return -1;
+        }
+        return max_lun;
 }