dm: Adjust lists_bind_fdt() to return the bound device

[karo-tx-uboot.git] / common / cmd_sata.c

diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index f62c0cb4f289887b01deeab12f6967a8f9665f64..fc921319667fcef566a84da876586811f79a39d3 100644 (file)
--- a/common/cmd_sata.c
+++ b/common/cmd_sata.c
@@ -7,20 +7,7 @@
  * Copyright (C) 2008 Freescale Semiconductor, Inc.
  *             Dave Liu <daveliu@freescale.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -28,7 +15,7 @@
 #include <part.h>
 #include <sata.h>
 
-int sata_curr_device = -1;
+static int sata_curr_device = -1;
 block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
 
 int __sata_initialize(void)
@@ -44,13 +31,17 @@ int __sata_initialize(void)
                sata_dev_desc[i].type = DEV_TYPE_HARDDISK;
                sata_dev_desc[i].lba = 0;
                sata_dev_desc[i].blksz = 512;
+               sata_dev_desc[i].log2blksz = LOG2(sata_dev_desc[i].blksz);
                sata_dev_desc[i].block_read = sata_read;
                sata_dev_desc[i].block_write = sata_write;
 
                rc = init_sata(i);
-               rc = scan_sata(i);
-               if ((sata_dev_desc[i].lba > 0) && (sata_dev_desc[i].blksz > 0))
-                       init_part(&sata_dev_desc[i]);
+               if (!rc) {
+                       rc = scan_sata(i);
+                       if (!rc && (sata_dev_desc[i].lba > 0) &&
+                               (sata_dev_desc[i].blksz > 0))
+                               init_part(&sata_dev_desc[i]);
+               }
        }
        sata_curr_device = 0;
        return rc;
@@ -64,7 +55,7 @@ block_dev_desc_t *sata_get_dev(int dev)
 }
 #endif
 
-int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int rc = 0;
 
@@ -79,7 +70,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        switch (argc) {
        case 0:
        case 1:
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        case 2:
                if (strncmp(argv[1],"inf", 3) == 0) {
                        int i;
@@ -116,7 +107,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        }
                        return rc;
                }
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        case 3:
                if (strncmp(argv[1], "dev", 3) == 0) {
                        int dev = (int)simple_strtoul(argv[2], NULL, 10);
@@ -147,7 +138,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        }
                        return rc;
                }
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        default: /* at least 4 args */
                if (strcmp(argv[1], "read") == 0) {
@@ -183,7 +174,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                n, (n == cnt) ? "OK" : "ERROR");
                        return (n == cnt) ? 0 : 1;
                } else {
-                       return cmd_usage(cmdtp);
+                       return CMD_RET_USAGE;
                }
 
                return rc;
@@ -193,7 +184,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(
        sata, 5, 1, do_sata,
        "SATA sub system",
-       "sata init - init SATA sub system\n"
+       "init - init SATA sub system\n"
        "sata info - show available SATA devices\n"
        "sata device [dev] - show or set current device\n"
        "sata part [dev] - print partition table\n"