diff mbox series

[v3,1/3] common: Drop check for DM in initf_dm()

Message ID 20241120153642.861633-2-sjg@chromium.org
State Accepted
Commit 70c79dc88f9678653919c1d1545817876f1c0802
Delegated to: Tom Rini
Headers show
Series Adjust how autoprobe is implemented | expand

Commit Message

Simon Glass Nov. 20, 2024, 3:36 p.m. UTC 
This is enabled by all boards, so drop the condition.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

(no changes since v1)

 common/board_f.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/common/board_f.c b/common/board_f.c
index 98dc2591e1d..1e1aa08530a 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -811,9 +811,11 @@  static int initf_bootstage(void)
 
 static int initf_dm(void)
 {
-#if defined(CONFIG_DM) && CONFIG_IS_ENABLED(SYS_MALLOC_F)
 	int ret;
 
+	if (!CONFIG_IS_ENABLED(SYS_MALLOC_F))
+		return 0;
+
 	bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f");
 	ret = dm_init_and_scan(true);
 	bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F);
@@ -825,7 +827,6 @@  static int initf_dm(void)
 		if (ret)
 			return ret;
 	}
-#endif
 
 	return 0;
 }