diff mbox series

[v2,2/4] malloc: Don't use ifdefs for SYS_MALLOC_DEFAULT_TO_INIT

Message ID 20230808225320.310926-3-sean.anderson@seco.com
State Changes Requested
Delegated to: Tom Rini
Headers show
Series [v2,1/4] common: Only mark malloc initialized after mem_malloc_init | expand

Commit Message

Sean Anderson Aug. 8, 2023, 10:53 p.m. UTC 
With CONFIG_IS_ENABLED we can eliminate some ifdefs.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

(no changes since v1)

 common/dlmalloc.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Simon Glass Aug. 9, 2023, 2:03 a.m. UTC | #1 
On Tue, 8 Aug 2023 at 16:53, Sean Anderson <sean.anderson@seco.com> wrote:
>
> With CONFIG_IS_ENABLED we can eliminate some ifdefs.
>
> Signed-off-by: Sean Anderson <sean.anderson@seco.com>
> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>
> (no changes since v1)
>
>  common/dlmalloc.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 0f9b7262d51..30c78ae976b 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -588,9 +588,7 @@  static void malloc_bin_reloc(void)
 static inline void malloc_bin_reloc(void) {}
 #endif
 
-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
 static void malloc_init(void);
-#endif
 
 ulong mem_malloc_start = 0;
 ulong mem_malloc_end = 0;
@@ -625,9 +623,8 @@  void mem_malloc_init(ulong start, ulong size)
 	mem_malloc_end = start + size;
 	mem_malloc_brk = start;
 
-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
-	malloc_init();
-#endif
+	if (CONFIG_IS_ENABLED(SYS_MALLOC_DEFAULT_TO_INIT))
+		malloc_init();
 
 	debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start,
 	      mem_malloc_end);
@@ -733,7 +730,6 @@  static unsigned int max_n_mmaps = 0;
 static unsigned long max_mmapped_mem = 0;
 #endif
 
-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
 static void malloc_init(void)
 {
 	int i, j;
@@ -762,7 +758,6 @@  static void malloc_init(void)
 	memset((void *)&current_mallinfo, 0, sizeof(struct mallinfo));
 #endif
 }
-#endif
 
 /*
   Debugging support