From 7f29d1100e51d99668e30e32bc7d96019e3cba63 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 15 Mar 2017 22:59:09 -0700 Subject: [PATCH] qcacld-3.0: UMAC: Remove module specific log level check Log level check is currently handled in QDF and hence we don't need another redundant check in UMAC modules. Change-Id: I86e7341ab3a634b50a4c4c2d70f6651e6e1f8de5 CRs-Fixed: 2020798 --- core/mac/src/cfg/cfg_debug.c | 18 +++++------------- core/mac/src/pe/lim/lim_debug.c | 18 +++++------------- .../sys/legacy/src/system/src/sys_entry_func.c | 18 ++++++------------ .../mac/src/sys/legacy/src/utils/src/log_api.c | 14 ++++---------- .../src/sys/legacy/src/utils/src/parser_api.c | 15 ++++----------- core/sme/src/common/sme_api.c | 16 ++++------------ 6 files changed, 28 insertions(+), 71 deletions(-) diff --git a/core/mac/src/cfg/cfg_debug.c b/core/mac/src/cfg/cfg_debug.c index 7d09c91763d1..4cfa82870472 100644 --- a/core/mac/src/cfg/cfg_debug.c +++ b/core/mac/src/cfg/cfg_debug.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014, 2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -40,18 +40,10 @@ void cfg_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) { #ifdef WLAN_DEBUG - /* Verify against current log level */ - if (loglevel > - pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_CFG_MODULE_ID)]) - return; - else { - va_list marker; + va_list marker; - va_start(marker, pString); /* Initialize variable arguments. */ - - log_debug(pMac, SIR_CFG_MODULE_ID, loglevel, pString, marker); - - va_end(marker); /* Reset variable arguments. */ - } + va_start(marker, pString); + log_debug(pMac, SIR_CFG_MODULE_ID, loglevel, pString, marker); + va_end(marker); #endif } diff --git a/core/mac/src/pe/lim/lim_debug.c b/core/mac/src/pe/lim/lim_debug.c index 51620d78bf9d..665267c4c76f 100644 --- a/core/mac/src/pe/lim/lim_debug.c +++ b/core/mac/src/pe/lim/lim_debug.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014, 2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -40,18 +40,10 @@ void lim_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) { #ifdef WLAN_DEBUG - /* Verify against current log level */ - if (loglevel > - pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_LIM_MODULE_ID)]) - return; - else { - va_list marker; + va_list marker; - va_start(marker, pString); /* Initialize variable arguments. */ - - log_debug(pMac, SIR_LIM_MODULE_ID, loglevel, pString, marker); - - va_end(marker); /* Reset variable arguments. */ - } + va_start(marker, pString); + log_debug(pMac, SIR_LIM_MODULE_ID, loglevel, pString, marker); + va_end(marker); #endif } diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index 9f30c14ffc34..4f931d944f3c 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -218,17 +218,11 @@ fail: void sys_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) { - /* Verify against current log level */ - if (loglevel > - pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_SYS_MODULE_ID)]) - return; - else { - va_list marker; +#ifdef WLAN_DEBUG + va_list marker; - va_start(marker, pString); /* Initialize variable arguments. */ - - log_debug(pMac, SIR_SYS_MODULE_ID, loglevel, pString, marker); - - va_end(marker); /* Reset variable arguments. */ - } + va_start(marker, pString); + log_debug(pMac, SIR_SYS_MODULE_ID, loglevel, pString, marker); + va_end(marker); +#endif } diff --git a/core/mac/src/sys/legacy/src/utils/src/log_api.c b/core/mac/src/sys/legacy/src/utils/src/log_api.c index 521168c8f008..cd16d38631ae 100644 --- a/core/mac/src/sys/legacy/src/utils/src/log_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/log_api.c @@ -118,17 +118,11 @@ void log_dbg(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, const char *pStr, ...) { #ifdef WLAN_DEBUG - if (debugLevel > pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(modId)]) - return; - else { - va_list marker; + va_list marker; - va_start(marker, pStr); /* Initialize variable arguments. */ - - log_debug(pMac, modId, debugLevel, pStr, marker); - - va_end(marker); /* Reset variable arguments. */ - } + va_start(marker, pStr); + log_debug(pMac, modId, debugLevel, pStr, marker); + va_end(marker); #endif } diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index af0f60ccfe7e..b173373d91fb 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -53,18 +53,11 @@ void dot11f_log(tpAniSirGlobal pMac, int loglevel, const char *pString, ...) { #ifdef WLAN_DEBUG - if ((uint32_t) loglevel > - pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_DBG_MODULE_ID)]) { - return; - } else { - va_list marker; + va_list marker; - va_start(marker, pString); /* Initialize variable arguments. */ - - log_debug(pMac, SIR_DBG_MODULE_ID, loglevel, pString, marker); - - va_end(marker); /* Reset variable arguments. */ - } + va_start(marker, pString); + log_debug(pMac, SIR_DBG_MODULE_ID, loglevel, pString, marker); + va_end(marker); #endif } diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index fc14aa06a715..e72c01092e89 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -5587,19 +5587,11 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, void sms_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) { #ifdef WLAN_DEBUG - /* Verify against current log level */ - if (loglevel > - pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_SMS_MODULE_ID)]) - return; - else { - va_list marker; + va_list marker; - va_start(marker, pString); /* Initialize variable arguments. */ - - log_debug(pMac, SIR_SMS_MODULE_ID, loglevel, pString, marker); - - va_end(marker); /* Reset variable arguments. */ - } + va_start(marker, pString); + log_debug(pMac, SIR_SMS_MODULE_ID, loglevel, pString, marker); + va_end(marker); #endif }