UEC: Fix compiler warnings introduced by linux/mii.h change

[u-boot] / common / cmd_cache.c

diff --git a/common/cmd_cache.c b/common/cmd_cache.c
index c0f2cbaf6742359edbc65a2ab3e26a0db93bf49a..5cdd8341f287045a9e0c610c7525b568283b42f5 100644 (file)
--- a/common/cmd_cache.c
+++ b/common/cmd_cache.c
@@ -27,19 +27,13 @@
 #include <common.h>
 #include <command.h>
 
-#if defined(CONFIG_CMD_CACHE)
-
 static int on_off (const char *);
 
-int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        switch (argc) {
        case 2:                 /* on / off     */
                switch (on_off(argv[1])) {
-#if 0  /* prevented by varargs handling; FALLTROUGH is harmless, too */
-               default: cmd_usage(cmdtp);
-                       return;
-#endif
                case 0: icache_disable();
                        break;
                case 1: icache_enable ();
@@ -51,21 +45,16 @@ int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        icache_status() ? "ON" : "OFF");
                return 0;
        default:
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        }
        return 0;
 }
 
-int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        switch (argc) {
        case 2:                 /* on / off     */
                switch (on_off(argv[1])) {
-#if 0  /* prevented by varargs handling; FALLTROUGH is harmless, too */
-               default: cmd_usage(cmdtp);
-                       return;
-#endif
                case 0: dcache_disable();
                        break;
                case 1: dcache_enable ();
@@ -77,8 +66,7 @@ int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        dcache_status() ? "ON" : "OFF");
                return 0;
        default:
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        }
        return 0;
 
@@ -99,14 +87,12 @@ U_BOOT_CMD(
        icache,   2,   1,     do_icache,
        "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,
        "enable or disable data cache",
        "[on, off]\n"
-       "    - enable or disable data (writethrough) cache\n"
+       "    - enable or disable data (writethrough) cache"
 );
-
-#endif