[U-Boot] [PATCH] Cleanup cache command prints

Only print when queried, not every time the setting is changed.
Signed-off-by: Joe Hershberger joe.hershberger@ni.com --- common/cmd_cache.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/common/cmd_cache.c b/common/cmd_cache.c index 9c228e2..5512f92 100644 --- a/common/cmd_cache.c +++ b/common/cmd_cache.c @@ -36,21 +36,24 @@ void __weak invalidate_icache_all(void) puts("No arch specific invalidate_icache_all available!\n"); }
-int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_icache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { switch (argc) { case 2: /* on / off */ switch (parse_argv(argv[1])) { - case 0: icache_disable(); + case 0: + icache_disable(); break; - case 1: icache_enable (); + case 1: + icache_enable(); break; - case 2: invalidate_icache_all(); + case 2: + invalidate_icache_all(); break; } - /* FALL TROUGH */ + break; case 1: /* get status */ - printf ("Instruction Cache is %s\n", + printf("Instruction Cache is %s\n", icache_status() ? "ON" : "OFF"); return 0; default: @@ -65,40 +68,42 @@ void __weak flush_dcache_all(void) /* please define arch specific flush_dcache_all */ }
-int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_dcache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { switch (argc) { - case 2: /* on / off */ + case 2: /* on / off */ switch (parse_argv(argv[1])) { - case 0: dcache_disable(); + case 0: + dcache_disable(); break; - case 1: dcache_enable (); + case 1: + dcache_enable(); break; - case 2: flush_dcache_all(); + case 2: + flush_dcache_all(); break; } - /* FALL TROUGH */ + break; case 1: /* get status */ - printf ("Data (writethrough) Cache is %s\n", + printf("Data (writethrough) Cache is %s\n", dcache_status() ? "ON" : "OFF"); return 0; default: return CMD_RET_USAGE; } return 0; - }
static int parse_argv(const char *s) { - if (strcmp(s, "flush") == 0) { - return (2); - } else if (strcmp(s, "on") == 0) { - return (1); - } else if (strcmp(s, "off") == 0) { - return (0); - } - return (-1); + if (strcmp(s, "flush") == 0) + return 2; + else if (strcmp(s, "on") == 0) + return 1; + else if (strcmp(s, "off") == 0) + return 0; + + return -1; }

On Friday 17 August 2012 16:54:23 Joe Hershberger wrote:
Only print when queried, not every time the setting is changed.
considering there's a lot more style changes here than functional, it'd probably be good to split up into two
as for the basic idea, makes sense to me -mike

Old code that is not compliant.
Signed-off-by: Joe Hershberger joe.hershberger@ni.com --- common/cmd_cache.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/common/cmd_cache.c b/common/cmd_cache.c index 9c228e2..13cc3d8 100644 --- a/common/cmd_cache.c +++ b/common/cmd_cache.c @@ -36,21 +36,24 @@ void __weak invalidate_icache_all(void) puts("No arch specific invalidate_icache_all available!\n"); }
-int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_icache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { switch (argc) { case 2: /* on / off */ switch (parse_argv(argv[1])) { - case 0: icache_disable(); + case 0: + icache_disable(); break; - case 1: icache_enable (); + case 1: + icache_enable(); break; - case 2: invalidate_icache_all(); + case 2: + invalidate_icache_all(); break; } /* FALL TROUGH */ case 1: /* get status */ - printf ("Instruction Cache is %s\n", + printf("Instruction Cache is %s\n", icache_status() ? "ON" : "OFF"); return 0; default: @@ -65,40 +68,42 @@ void __weak flush_dcache_all(void) /* please define arch specific flush_dcache_all */ }
-int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_dcache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { switch (argc) { - case 2: /* on / off */ + case 2: /* on / off */ switch (parse_argv(argv[1])) { - case 0: dcache_disable(); + case 0: + dcache_disable(); break; - case 1: dcache_enable (); + case 1: + dcache_enable(); break; - case 2: flush_dcache_all(); + case 2: + flush_dcache_all(); break; } - /* FALL TROUGH */ + break; case 1: /* get status */ - printf ("Data (writethrough) Cache is %s\n", + printf("Data (writethrough) Cache is %s\n", dcache_status() ? "ON" : "OFF"); return 0; default: return CMD_RET_USAGE; } return 0; - }
static int parse_argv(const char *s) { - if (strcmp(s, "flush") == 0) { - return (2); - } else if (strcmp(s, "on") == 0) { - return (1); - } else if (strcmp(s, "off") == 0) { - return (0); - } - return (-1); + if (strcmp(s, "flush") == 0) + return 2; + else if (strcmp(s, "on") == 0) + return 1; + else if (strcmp(s, "off") == 0) + return 0; + + return -1; }

Only print when queried, not every time the setting is changed.
Signed-off-by: Joe Hershberger joe.hershberger@ni.com --- common/cmd_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/cmd_cache.c b/common/cmd_cache.c index 13cc3d8..5512f92 100644 --- a/common/cmd_cache.c +++ b/common/cmd_cache.c @@ -51,7 +51,7 @@ int do_icache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) invalidate_icache_all(); break; } - /* FALL TROUGH */ + break; case 1: /* get status */ printf("Instruction Cache is %s\n", icache_status() ? "ON" : "OFF");

On Wed, Oct 03, 2012 at 10:56:16AM -0000, Joe Hershberger wrote:
Old code that is not compliant.
Signed-off-by: Joe Hershberger joe.hershberger@ni.com
Applied to u-boot/master, along with the rest of the series, thanks!
participants (3)
-
Joe Hershberger
-
Mike Frysinger
-
Tom Rini