From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Date: Mon, 27 May 2024 20:04:17 +0000 (+0200)
Subject: global_data.h: drop write-only field dm_root_f
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=a8729a260b53b9a2fce2607ac90744a47f96daef;p=u-boot.git

global_data.h: drop write-only field dm_root_f

The dm_root_f field seems to be entirely write-only and hence
redundant, unless 'git grep' fails to find some access generated via
preprocessor token concatenation or similar.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/board_r.c b/common/board_r.c
index c823cd262f..d4ba245ac6 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -230,8 +230,7 @@ static int initr_dm(void)
 
 	oftree_reset();
 
-	/* Save the pre-reloc driver model and start a new one */
-	gd->dm_root_f = gd->dm_root;
+	/* Drop the pre-reloc driver model and start a new one */
 	gd->dm_root = NULL;
 #ifdef CONFIG_TIMER
 	gd->timer = NULL;
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index fcc3c6e14c..aa336d63e3 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -195,10 +195,6 @@ struct global_data {
 	 * @dm_root: root instance for Driver Model
 	 */
 	struct udevice *dm_root;
-	/**
-	 * @dm_root_f: pre-relocation root instance
-	 */
-	struct udevice *dm_root_f;
 	/**
 	 * @uclass_root_s:
 	 * head of core tree when uclasses are not in read-only memory.
diff --git a/test/dm/core.c b/test/dm/core.c
index 4741c81bcc..dbad1b317d 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -1006,7 +1006,6 @@ static int dm_test_uclass_before_ready(struct unit_test_state *uts)
 	ut_assertok(uclass_get(UCLASS_TEST, &uc));
 
 	gd->dm_root = NULL;
-	gd->dm_root_f = NULL;
 	memset(&gd->uclass_root, '\0', sizeof(gd->uclass_root));
 
 	ut_asserteq_ptr(NULL, uclass_find(UCLASS_TEST));