hash_command() takes a struct cmd_tbl pointer and the command flag but uses neither; they are threaded through from each caller's command function purely to satisfy the prototype. Drop both arguments so the helper is independent of the command signature, which lets a caller that no longer has cmdtp/flag to hand (a getopt-state command) call it directly.
Update all callers: the hash, crc32, md5sum, sha1sum and sm3sum commands. Signed-off-by: Simon Glass <[email protected]> --- (no changes since v1) cmd/hash.c | 2 +- cmd/md5sum.c | 2 +- cmd/mem.c | 2 +- cmd/sha1sum.c | 2 +- cmd/sm3sum.c | 2 +- common/hash.c | 4 ++-- include/hash.h | 6 ++---- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cmd/hash.c b/cmd/hash.c index 96d0e443a5b..f4f1dcf02f9 100644 --- a/cmd/hash.c +++ b/cmd/hash.c @@ -41,7 +41,7 @@ static int do_hash(struct cmd_tbl *cmdtp, int flag, int argc, argv++; for (s = *argv; *s; s++) *s = tolower(*s); - return hash_command(*argv, flags, cmdtp, flag, argc - 1, argv + 1); + return hash_command(*argv, flags, argc - 1, argv + 1); } U_BOOT_CMD( diff --git a/cmd/md5sum.c b/cmd/md5sum.c index ded3f9e1831..a96c0dc97b6 100644 --- a/cmd/md5sum.c +++ b/cmd/md5sum.c @@ -33,7 +33,7 @@ static int do_md5sum(struct cmd_tbl *cmdtp, int flag, int argc, ac--; } - return hash_command("md5", flags, cmdtp, flag, ac, av); + return hash_command("md5", flags, ac, av); } #if IS_ENABLED(CONFIG_MD5SUM_VERIFY) diff --git a/cmd/mem.c b/cmd/mem.c index 68eb6989b94..4a7629eba02 100644 --- a/cmd/mem.c +++ b/cmd/mem.c @@ -1263,7 +1263,7 @@ static int do_mem_crc(struct cmd_tbl *cmdtp, int flag, int argc, } #endif - return hash_command("crc32", flags, cmdtp, flag, ac, av); + return hash_command("crc32", flags, ac, av); } #endif diff --git a/cmd/sha1sum.c b/cmd/sha1sum.c index f2757146bba..18cefb4bb03 100644 --- a/cmd/sha1sum.c +++ b/cmd/sha1sum.c @@ -31,7 +31,7 @@ int do_sha1sum(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } #endif - return hash_command("sha1", flags, cmdtp, flag, ac, av); + return hash_command("sha1", flags, ac, av); } #ifdef CONFIG_SHA1SUM_VERIFY diff --git a/cmd/sm3sum.c b/cmd/sm3sum.c index 9044a322e22..7c59b7c8cab 100644 --- a/cmd/sm3sum.c +++ b/cmd/sm3sum.c @@ -28,7 +28,7 @@ static int do_sm3sum(struct cmd_tbl *cmdtp, int flag, int argc, ac--; } - return hash_command("sm3_256", flags, cmdtp, flag, ac, av); + return hash_command("sm3_256", flags, ac, av); } #if IS_ENABLED(CONFIG_SM3SUM_VERIFY) diff --git a/common/hash.c b/common/hash.c index 71c4bef5826..790fb2a5248 100644 --- a/common/hash.c +++ b/common/hash.c @@ -580,8 +580,8 @@ static void hash_show(struct hash_algo *algo, ulong addr, ulong len, uint8_t *ou printf("%02x", output[i]); } -int hash_command(const char *algo_name, int flags, struct cmd_tbl *cmdtp, - int flag, int argc, char *const argv[]) +int hash_command(const char *algo_name, int flags, int argc, + char *const argv[]) { ulong addr, len; diff --git a/include/hash.h b/include/hash.h index 8b3f79ec473..577875f321c 100644 --- a/include/hash.h +++ b/include/hash.h @@ -90,13 +90,11 @@ struct hash_algo { * * @algo_name: Hash algorithm being used (lower case!) * @flags: Flags value (HASH_FLAG_...) - * @cmdtp: Pointer to command table entry - * @flag: Some flags normally 0 (see CMD_FLAG_.. above) * @argc: Number of arguments (arg 0 must be the command text) * @argv: Arguments */ -int hash_command(const char *algo_name, int flags, struct cmd_tbl *cmdtp, - int flag, int argc, char *const argv[]); +int hash_command(const char *algo_name, int flags, int argc, + char *const argv[]); /** * hash_block() - Hash a block according to the requested algorithm -- 2.43.0
