st_smi: Change the flash probing method

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

diff --git a/common/cmd_mp.c b/common/cmd_mp.c
index 4d7b871528d2f4635447bed41d9d2edccc61a4d7..4b27be495672201b35031ef4a3f5b335c8728341 100644 (file)
--- a/common/cmd_mp.c
+++ b/common/cmd_mp.c
@@ -28,43 +28,35 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned long cpuid;
 
-       if (argc < 3) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 3)
+               return CMD_RET_USAGE;
 
        cpuid = simple_strtoul(argv[1], NULL, 10);
-       if (cpuid >= cpu_numcores()) {
-               printf ("Core num: %lu is out of range[0..%d]\n",
-                               cpuid, cpu_numcores() - 1);
+       if (!is_core_valid(cpuid)) {
+               printf ("Core num: %lu is not valid\n", cpuid);
                return 1;
        }
 
 
        if (argc == 3) {
-               if (strncmp(argv[2], "reset", 5) == 0) {
+               if (strncmp(argv[2], "reset", 5) == 0)
                        cpu_reset(cpuid);
-               } else if (strncmp(argv[2], "status", 6) == 0) {
+               else if (strncmp(argv[2], "status", 6) == 0)
                        cpu_status(cpuid);
-               } else if (strncmp(argv[2], "disable", 7) == 0) {
+               else if (strncmp(argv[2], "disable", 7) == 0)
                        return cpu_disable(cpuid);
-               } else {
-                       cmd_usage(cmdtp);
-                       return 1;
-               }
+               else
+                       return CMD_RET_USAGE;
+
                return 0;
        }
 
        /* 4 or greater, make sure its release */
-       if (strncmp(argv[2], "release", 7) != 0) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (strncmp(argv[2], "release", 7) != 0)
+               return CMD_RET_USAGE;
 
-       if (cpu_release(cpuid, argc - 3, argv + 3)) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (cpu_release(cpuid, argc - 3, argv + 3))
+               return CMD_RET_USAGE;
 
        return 0;
 }