Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D35BC433EF for ; Sun, 8 May 2022 10:02:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6024E83C28; Sun, 8 May 2022 12:02:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RZFqLzRr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DFF3483C41; Sun, 8 May 2022 12:01:59 +0200 (CEST) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3E4E683C1B for ; Sun, 8 May 2022 12:01:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ovpanait@gmail.com Received: by mail-ed1-x52d.google.com with SMTP id w24so5419788edx.3 for ; Sun, 08 May 2022 03:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=V4aX2E5LICvqqe2lznB/x86CrxrieAgskiBuKGDLxWw=; b=RZFqLzRroRlvpsEizETjCgW/hkpwyD0WAZFdOfuefyAFiUTl46RHsjZ1czUotpWtJQ goJlwtAcHaR0JsTx/gzZBOqZOee9grTPwT9BbbQJnui/I107Pva7x/ezQ06A2HB6bkde GfQbUiwq4U/NanY3AUFmleop6CpgetnpPz7jgyfSvnekNe6U6yVefODvDqc6MQISu4Ll 18dDA6kEHP+urc3GIHC6KNPqN/aQArYjuaE5WrEM9YHvKXCx16k7pjRhiUOAgQiRB+4R lR4FDffheHVRt30UTSj6ebERKzf7/is2V5NjjyYwrW51p6B7meU5N/tzJ52Kund0QD7u cpqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=V4aX2E5LICvqqe2lznB/x86CrxrieAgskiBuKGDLxWw=; b=ZrxSujWufWZcxpjam5L22OWPOx866Xb1vzZpaY5JdnYuhEMpRlW2f48OOsBoDO3thw VjwHFexT18PIN8MTh5zo4+lE0mLvZgvz1PHCG6wrHJw7q0YCYSN+isbK+UWYM8g+CBfC SR+3v1NhoUr/vvFnK5Rr+6onGx001rq0exNzwPx1HNWGF/Fvv/tc5X43KnydhrlMgM2U svv3Zvrv1FPcIyIlHuWmxRofo827ReGwmTpkjDQ7ONnbVeMyfQy8kqUBS4r6IIKhro4V MLO5KIpvNtpo7NuCrGZUcj6MmQrLmEBdbVtNJdeWG1NlTmzTZNbo+L8aV130lMKHqgeK D61g== X-Gm-Message-State: AOAM530l7L0kOmp2IAoUj/czW/icDbTglRFPp0CE2yrBQs97rtbk8T9P Tmq2md8D1qJSPRJX871NIy96W9KdFsI= X-Google-Smtp-Source: ABdhPJw3/8OTAb8PvdYIZFUJDUMRVF7rFGjxwQYlArFpErNOViJYhkBsjQ6+tiB/ofuAu0Drobs3Mg== X-Received: by 2002:a50:9511:0:b0:428:7acf:99b9 with SMTP id u17-20020a509511000000b004287acf99b9mr6686764eda.338.1652004116799; Sun, 08 May 2022 03:01:56 -0700 (PDT) Received: from localhost.localdomain ([2a02:2f07:610c:b900:823d:d673:64ce:a67a]) by smtp.gmail.com with ESMTPSA id j37-20020a05640223a500b0042617ba638bsm4543843eda.21.2022.05.08.03.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 03:01:56 -0700 (PDT) From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Simon Glass Subject: [PATCH] cmd: dm: migrate dm command to use U_BOOT_CMD_WITH_SUBCMDS() Date: Sun, 8 May 2022 13:01:42 +0300 Message-Id: <20220508100142.1682254-1-ovpanait@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean 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 --- cmd/dm.c | 64 +++++++++++--------------------------------------------- 1 file changed, 12 insertions(+), 52 deletions(-) diff --git a/cmd/dm.c b/cmd/dm.c index 1dd19fe45b..ca609224f5 100644 --- a/cmd/dm.c +++ b/cmd/dm.c @@ -8,12 +8,6 @@ #include #include -#include -#include -#include -#include -#include -#include #include 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)); -- 2.25.1