Remove superfluous preprocessor tests from some cmd_*.c files.

[u-boot] / common / cmd_cache.c

diff --git a/common/cmd_cache.c b/common/cmd_cache.c
index 6c250bc1c025cda68385d85db853ba43b82fe424..12022584196153e2b3d570f4fae1d692520807f4 100644 (file)
--- a/common/cmd_cache.c
+++ b/common/cmd_cache.c
@@ -27,8 +27,6 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_CACHE)
-
 static int on_off (const char *);
 
 int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -37,7 +35,7 @@ int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        case 2:                 /* on / off     */
                switch (on_off(argv[1])) {
 #if 0  /* prevented by varargs handling; FALLTROUGH is harmless, too */
-               default: printf ("Usage:\n%s\n", cmdtp->usage);
+               default: cmd_usage(cmdtp);
                        return;
 #endif
                case 0: icache_disable();
@@ -51,7 +49,7 @@ int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        icache_status() ? "ON" : "OFF");
                return 0;
        default:
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        return 0;
@@ -63,7 +61,7 @@ int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        case 2:                 /* on / off     */
                switch (on_off(argv[1])) {
 #if 0  /* prevented by varargs handling; FALLTROUGH is harmless, too */
-               default: printf ("Usage:\n%s\n", cmdtp->usage);
+               default: cmd_usage(cmdtp);
                        return;
 #endif
                case 0: dcache_disable();
@@ -77,7 +75,7 @@ int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        dcache_status() ? "ON" : "OFF");
                return 0;
        default:
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        return 0;
@@ -97,16 +95,14 @@ static int on_off (const char *s)
 
 U_BOOT_CMD(
        icache,   2,   1,     do_icache,
-       "icache  - enable or disable instruction cache\n",
+       "enable or disable instruction cache",
        "[on, off]\n"
-       "    - enable or disable instruction cache\n"
+       "    - enable or disable instruction cache"
 );
 
 U_BOOT_CMD(
        dcache,   2,   1,     do_dcache,
-       "dcache  - enable or disable data cache\n",
+       "enable or disable data cache",
        "[on, off]\n"
-       "    - enable or disable data (writethrough) cache\n"
+       "    - enable or disable data (writethrough) cache"
 );
-
-#endif /* CFG_CMD_CACHE */