Sfoglia il codice sorgente

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
Srinivas Girigowda 8 anni fa
parent
commit
7f29d1100e

+ 5 - 13
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
 }

+ 5 - 13
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
 }

+ 6 - 12
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
 }

+ 4 - 10
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
 }
 

+ 4 - 11
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_start(marker, pString);      /* Initialize variable arguments. */
+	va_list marker;
 
-		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
 }
 

+ 4 - 12
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_start(marker, pString);      /* Initialize variable arguments. */
+	va_list marker;
 
-		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
 }