merged current version of git://git.denx.de/u-boot

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

diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index cd21f2a9901d0ded0085abac61c169ecce607b82..6a9282139ef7f228dec1cbe4bb7c983bb115b4aa 100644 (file)
--- a/common/cmd_sata.c
+++ b/common/cmd_sata.c
@@ -63,12 +63,14 @@ int __sata_initialize(void)
 }
 int sata_initialize(void) __attribute__((weak,alias("__sata_initialize")));
 
+#ifdef CONFIG_PARTITIONS
 block_dev_desc_t *sata_get_dev(int dev)
 {
        return (dev < CONFIG_SYS_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL;
 }
+#endif
 
-int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int rc = 0;
 
@@ -83,8 +85,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        switch (argc) {
        case 0:
        case 1:
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        case 2:
                if (strncmp(argv[1],"inf", 3) == 0) {
                        int i;
@@ -121,8 +122,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        }
                        return rc;
                }
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        case 3:
                if (strncmp(argv[1], "dev", 3) == 0) {
                        int dev = (int)simple_strtoul(argv[2], NULL, 10);
@@ -153,8 +153,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        }
                        return rc;
                }
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
 
        default: /* at least 4 args */
                if (strcmp(argv[1], "read") == 0) {
@@ -190,8 +189,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                n, (n == cnt) ? "OK" : "ERROR");
                        return (n == cnt) ? 0 : 1;
                } else {
-                       cmd_usage(cmdtp);
-                       rc = 1;
+                       return cmd_usage(cmdtp);
                }
 
                return rc;