bootstage: Convert NAND progress numbers to enums

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

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 89519faad3b04a451ee7c441e857d8398b0aa017..c9f2a0864ae02e67f0beffbeee7152aef5a9042a 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -230,23 +230,23 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
                break;
 #endif
        default:
-               show_boot_progress (-80);
-               return cmd_usage(cmdtp);
+               show_boot_error(80);
+               return CMD_RET_USAGE;
        }
 
-       show_boot_progress (80);
+       show_boot_progress(80);
        if ((size = NetLoop(proto)) < 0) {
-               show_boot_progress (-81);
+               show_boot_error(81);
                return 1;
        }
 
-       show_boot_progress (81);
+       show_boot_progress(81);
        /* NetLoop ok, update environment */
        netboot_update_env();
 
        /* done if no file was loaded (no errors though) */
        if (size == 0) {
-               show_boot_progress (-82);
+               show_boot_error(82);
                return 0;
        }
 
@@ -257,9 +257,9 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
        rcode = bootm_maybe_autostart(cmdtp, argv[0]);
 
        if (rcode < 0)
-               show_boot_progress (-83);
+               show_boot_error(83);
        else
-               show_boot_progress (84);
+               show_boot_progress(84);
        return rcode;
 }
 
@@ -271,7 +271,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        NetPingIP = string_to_ip(argv[1]);
        if (NetPingIP == 0)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        if (NetLoop(PING) < 0) {
                printf("ping failed; host %s is not alive\n", argv[1]);
@@ -377,7 +377,7 @@ U_BOOT_CMD(
 int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        if (argc == 1)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * We should check for a valid hostname: