]> git.sur5r.net Git - u-boot/blobdiff - common/cmd_ide.c
sandbox: config: enable fdt and snprintf() options
[u-boot] / common / cmd_ide.c
index bbede1ce818caed3f96b31d72674295906557dd0..3fb7506ddce7a353761769ca8d01106c5fbf875e 100644 (file)
@@ -179,7 +179,7 @@ int do_ide(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], "res", 3) == 0) {
                        puts("\nReset IDE"
@@ -232,7 +232,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                        }
                        return rcode;
                }
-               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);
@@ -266,7 +266,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                        return rcode;
                }
 
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        default:
                /* at least 4 args */
 
@@ -325,7 +325,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                        else
                                return 1;
                } else {
-                       return cmd_usage(cmdtp);
+                       return CMD_RET_USAGE;
                }
 
                return rcode;
@@ -361,7 +361,7 @@ int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                break;
        default:
                show_boot_progress(-42);
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        }
        show_boot_progress(42);
 
@@ -985,7 +985,6 @@ static void ide_ident(block_dev_desc_t *dev_desc)
 
 #ifdef CONFIG_ATAPI
        int retries = 0;
-       int do_retry = 0;
 #endif
 
 #ifdef CONFIG_TUNE_PIO
@@ -1007,7 +1006,6 @@ static void ide_ident(block_dev_desc_t *dev_desc)
        dev_desc->if_type = IF_TYPE_IDE;
 #ifdef CONFIG_ATAPI
 
-       do_retry = 0;
        retries = 0;
 
        /* Warning: This will be tricky to read */