cmd: dm: migrate dm command to use U_BOOT_CMD_WITH_SUBCMDS()

Migrate dm command to use U_BOOT_CMD_WITH_SUBCMDS() helper macro, to reduce
duplicated code. We can also drop the CONFIG_NEEDS_MANUAL_RELOC exception,
as the command list is updated post relocation in board_r.c initcall
initr_manual_reloc_cmdtable().

Signed-off-by: Ovidiu Panait <ovpanait@gmail.com>

1 files changed, 12 insertions, 52 deletions

diff --git a/cmd/dm.c b/cmd/dm.c
index 1dd19fe45b5..ca609224f55 100644
--- a/cmd/dm.c
+++ b/cmd/dm.c
@@ -8,12 +8,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <dm.h>
-#include <malloc.h>
-#include <mapmem.h>
-#include <errno.h>
-#include <asm/io.h>
-#include <dm/root.h>
 #include <dm/util.h>
 
 static int do_dm_dump_all(struct cmd_tbl *cmdtp, int flag, int argc,
@@ -64,55 +58,21 @@ static int do_dm_dump_static_driver_info(struct cmd_tbl *cmdtp, int flag, int ar
 	return 0;
 }
 
-static struct cmd_tbl test_commands[] = {
-	U_BOOT_CMD_MKENT(tree, 0, 1, do_dm_dump_all, "", ""),
-	U_BOOT_CMD_MKENT(uclass, 1, 1, do_dm_dump_uclass, "", ""),
-	U_BOOT_CMD_MKENT(devres, 1, 1, do_dm_dump_devres, "", ""),
-	U_BOOT_CMD_MKENT(drivers, 1, 1, do_dm_dump_drivers, "", ""),
-	U_BOOT_CMD_MKENT(compat, 1, 1, do_dm_dump_driver_compat, "", ""),
-	U_BOOT_CMD_MKENT(static, 1, 1, do_dm_dump_static_driver_info, "", ""),
-};
-
-static __maybe_unused void dm_reloc(void)
-{
-	static int relocated;
-
-	if (!relocated) {
-		fixup_cmdtable(test_commands, ARRAY_SIZE(test_commands));
-		relocated = 1;
-	}
-}
-
-static int do_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	struct cmd_tbl *test_cmd;
-	int ret;
-
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-	dm_reloc();
-#endif
-
-	if (argc < 2)
-		return CMD_RET_USAGE;
-	test_cmd = find_cmd_tbl(argv[1], test_commands,
-				ARRAY_SIZE(test_commands));
-	argc -= 2;
-	argv += 2;
-	if (!test_cmd || argc > test_cmd->maxargs)
-		return CMD_RET_USAGE;
-
-	ret = test_cmd->cmd(test_cmd, flag, argc, argv);
-
-	return cmd_process_error(test_cmd, ret);
-}
-
-U_BOOT_CMD(
-	dm,	3,	1,	do_dm,
-	"Driver model low level access",
+#if CONFIG_IS_ENABLED(SYS_LONGHELP)
+static char dm_help_text[] =
 	"tree          Dump driver model tree ('*' = activated)\n"
 	"dm uclass        Dump list of instances for each uclass\n"
 	"dm devres        Dump list of device resources for each device\n"
 	"dm drivers       Dump list of drivers with uclass and instances\n"
 	"dm compat        Dump list of drivers with compatibility strings\n"
 	"dm static        Dump list of drivers with static platform data"
-);
+	;
+#endif
+
+U_BOOT_CMD_WITH_SUBCMDS(dm, "Driver model low level access", dm_help_text,
+	U_BOOT_SUBCMD_MKENT(tree, 1, 1, do_dm_dump_all),
+	U_BOOT_SUBCMD_MKENT(uclass, 1, 1, do_dm_dump_uclass),
+	U_BOOT_SUBCMD_MKENT(devres, 1, 1, do_dm_dump_devres),
+	U_BOOT_SUBCMD_MKENT(drivers, 1, 1, do_dm_dump_drivers),
+	U_BOOT_SUBCMD_MKENT(compat, 1, 1, do_dm_dump_driver_compat),
+	U_BOOT_SUBCMD_MKENT(static, 1, 1, do_dm_dump_static_driver_info));