Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ac0c6a3 authored by Mohammed Siddiq's avatar Mohammed Siddiq Committed by snandini
Browse files

qcacmn: Use IS_ENABLED for the definition of kernel module 

Add code to use IS_ENABLED for CONFIG_WCNSS_MEM_PRE_ALLOC
kernel modules and remove inclusion of reduntant header
file cnss.h.

Change-Id: If1d098c7c6f326d12700f06318909a7fc0e7895a
CRs-fixed: 2702368
parent 1bb6b759

qdf/linux/src/i_qdf_time.h

+0 −3
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
#ifdef MSM_PLATFORM

#include <asm/arch_timer.h>

#endif

#ifdef CONFIG_CNSS

#include <net/cnss.h>

#endif



typedef unsigned long __qdf_time_t;

typedef ktime_t  __qdf_ktime_t;

qdf/linux/src/qdf_mem.c

+2 −6
Original line number Diff line number Diff line
@@ -35,11 +35,7 @@ 
#include <linux/seq_file.h>

#include <linux/string.h>



#if defined(CONFIG_CNSS)

#include <net/cnss.h>

#endif



#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC

#if IS_ENABLED(CONFIG_WCNSS_MEM_PRE_ALLOC)

#include <net/cnss_prealloc.h>

#endif
@@ -1035,7 +1031,7 @@ void __qdf_mempool_free(qdf_device_t osdev, __qdf_mempool_t pool, void *buf) 
}

qdf_export_symbol(__qdf_mempool_free);



#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC

#if IS_ENABLED(CONFIG_WCNSS_MEM_PRE_ALLOC)

/**

 * qdf_mem_prealloc_get() - conditionally pre-allocate memory

 * @size: the number of bytes to allocate