Merge branch '2022-11-23-assorted-fixes'

[platform/kernel/u-boot.git] / cmd / iotrace.c

diff --git a/cmd/iotrace.c b/cmd/iotrace.c
index fa6c68b..f28359e 100644 (file)
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -55,13 +55,13 @@ static void do_print_trace(void)
        }
 }
 
-static int do_set_buffer(int argc, char * const argv[])
+static int do_set_buffer(int argc, char *const argv[])
 {
        ulong addr = 0, size = 0;
 
        if (argc == 2) {
-               addr = simple_strtoul(*argv++, NULL, 16);
-               size = simple_strtoul(*argv++, NULL, 16);
+               addr = hextoul(*argv++, NULL);
+               size = hextoul(*argv++, NULL);
        } else if (argc != 0) {
                return CMD_RET_USAGE;
        }
@@ -71,13 +71,13 @@ static int do_set_buffer(int argc, char * const argv[])
        return 0;
 }
 
-static int do_set_region(int argc, char * const argv[])
+static int do_set_region(int argc, char *const argv[])
 {
        ulong addr = 0, size = 0;
 
        if (argc == 2) {
-               addr = simple_strtoul(*argv++, NULL, 16);
-               size = simple_strtoul(*argv++, NULL, 16);
+               addr = hextoul(*argv++, NULL);
+               size = hextoul(*argv++, NULL);
        } else if (argc != 0) {
                return CMD_RET_USAGE;
        }
@@ -87,7 +87,7 @@ static int do_set_region(int argc, char * const argv[])
        return 0;
 }
 
-int do_iotrace(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_iotrace(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        const char *cmd = argc < 2 ? NULL : argv[1];