From 3e85d50d6d58c20cbcf043186f7c5fc659239128 Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Tue, 11 Jul 2023 15:12:12 +0530 Subject: [PATCH] cnss2: Correctly check for WCNSS_MEM_PRE_ALLOC macro After CNSS2 switched to Bazel based compilation, conditional compilation macros became same as configs and are enabled directly from defconfig. Fix macro check in the code for both 'y' or 'm' to enable code based on the that. Change-Id: I12ca87c851a7b47af0255716ce1b9f59ad2eb70a CRs-Fixed: 3553530 --- cnss2/main.c | 2 +- icnss2/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cnss2/main.c b/cnss2/main.c index b18eb2d05a..9d2399c5a5 100644 --- a/cnss2/main.c +++ b/cnss2/main.c @@ -4474,7 +4474,7 @@ static void cnss_sram_dump_init(struct cnss_plat_data *plat_priv) } #endif -#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC +#if IS_ENABLED(CONFIG_WCNSS_MEM_PRE_ALLOC) static void cnss_initialize_mem_pool(unsigned long device_id) { cnss_initialize_prealloc_pool(device_id); diff --git a/icnss2/main.c b/icnss2/main.c index 44733b6813..a7841244b8 100644 --- a/icnss2/main.c +++ b/icnss2/main.c @@ -4620,7 +4620,7 @@ static void rproc_restart_level_notifier(void *data, struct rproc *rproc) } } -#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC +#if IS_ENABLED(CONFIG_WCNSS_MEM_PRE_ALLOC) static void icnss_initialize_mem_pool(unsigned long device_id) { cnss_initialize_prealloc_pool(device_id);