From 500ae3de1112c9027f21cae3cdd36740f0857f7a Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Mon, 19 Mar 2018 12:47:33 -0700 Subject: [PATCH] qcacld-3.0: Use level-specific QDF_TRACE_RATE_LIMITED Change Ie062ada403f8a31aebcde691396987ad9e5352b5 introduced level- specific logging wrappers. Instead of using QDF_TRACE_RATE_LIMITED directly, use the level-specific versions. Change-Id: I21b47f443ae53d1780fd21e352f69b0ea48ae726 CRs-Fixed: 2208563 --- components/ocb/core/inc/wlan_ocb_main.h | 13 +++++-------- core/hdd/inc/wlan_hdd_main.h | 13 +++++-------- core/mac/src/include/sir_debug.h | 13 +++++-------- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/components/ocb/core/inc/wlan_ocb_main.h b/components/ocb/core/inc/wlan_ocb_main.h index 6ae9aba4e468..0e66c828ed0d 100644 --- a/components/ocb/core/inc/wlan_ocb_main.h +++ b/components/ocb/core/inc/wlan_ocb_main.h @@ -29,14 +29,11 @@ #include #include -#define __ocb_log_rl(level, format, args...) \ - QDF_TRACE_RATE_LIMITED(QDF_MODULE_ID_OCB, level, FL(format), ## args) - -#define ocb_alert_rl(params...) __ocb_log_rl(QDF_TRACE_LEVEL_FATAL, params) -#define ocb_err_rl(params...) __ocb_log_rl(QDF_TRACE_LEVEL_ERROR, params) -#define ocb_warn_rl(params...) __ocb_log_rl(QDF_TRACE_LEVEL_WARN, params) -#define ocb_info_rl(params...) __ocb_log_rl(QDF_TRACE_LEVEL_INFO, params) -#define ocb_debug_rl(params...) __ocb_log_rl(QDF_TRACE_LEVEL_DEBUG, params) +#define ocb_alert_rl(params...) QDF_TRACE_FATAL_RL(QDF_MODULE_ID_OCB, params) +#define ocb_err_rl(params...) QDF_TRACE_ERROR_RL(QDF_MODULE_ID_OCB, params) +#define ocb_warn_rl(params...) QDF_TRACE_WARN_RL(QDF_MODULE_ID_OCB, params) +#define ocb_info_rl(params...) QDF_TRACE_INFO_RL(QDF_MODULE_ID_OCB, params) +#define ocb_debug_rl(params...) QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_OCB, params) #define ocb_log(level, args...) \ QDF_TRACE(QDF_MODULE_ID_OCB, level, ## args) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 57fc217a2724..4ce49bddbbf4 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -226,14 +226,11 @@ #define WLAN_CHIP_VERSION "WCNSS" -#define __hdd_log_rl(level, format, args...) \ - QDF_TRACE_RATE_LIMITED(QDF_MODULE_ID_HDD, level, FL(format), ## args) - -#define hdd_alert_rl(params...) __hdd_log_rl(QDF_TRACE_LEVEL_FATAL, params) -#define hdd_err_rl(params...) __hdd_log_rl(QDF_TRACE_LEVEL_ERROR, params) -#define hdd_warn_rl(params...) __hdd_log_rl(QDF_TRACE_LEVEL_WARN, params) -#define hdd_info_rl(params...) __hdd_log_rl(QDF_TRACE_LEVEL_INFO, params) -#define hdd_debug_rl(params...) __hdd_log_rl(QDF_TRACE_LEVEL_DEBUG, params) +#define hdd_alert_rl(params...) QDF_TRACE_FATAL_RL(QDF_MODULE_ID_HDD, params) +#define hdd_err_rl(params...) QDF_TRACE_ERROR_RL(QDF_MODULE_ID_HDD, params) +#define hdd_warn_rl(params...) QDF_TRACE_WARN_RL(QDF_MODULE_ID_HDD, params) +#define hdd_info_rl(params...) QDF_TRACE_INFO_RL(QDF_MODULE_ID_HDD, params) +#define hdd_debug_rl(params...) QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_HDD, params) #define hdd_log(level, args...) QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) #define hdd_logfl(level, format, args...) hdd_log(level, FL(format), ## args) diff --git a/core/mac/src/include/sir_debug.h b/core/mac/src/include/sir_debug.h index aa55b305516d..83235b27ceac 100644 --- a/core/mac/src/include/sir_debug.h +++ b/core/mac/src/include/sir_debug.h @@ -46,14 +46,11 @@ #define MAC_ADDR_ARRAY(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5] #define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x" -#define __pe_log_rl(level, format, args...) \ - QDF_TRACE_RATE_LIMITED(QDF_MODULE_ID_PE, level, FL(format), ## args) - -#define pe_alert_rl(params...) __pe_log_rl(QDF_TRACE_LEVEL_FATAL, params) -#define pe_err_rl(params...) __pe_log_rl(QDF_TRACE_LEVEL_ERROR, params) -#define pe_warn_rl(params...) __pe_log_rl(QDF_TRACE_LEVEL_WARN, params) -#define pe_info_rl(params...) __pe_log_rl(QDF_TRACE_LEVEL_INFO, params) -#define pe_debug_rl(params...) __pe_log_rl(QDF_TRACE_LEVEL_DEBUG, params) +#define pe_alert_rl(params...) QDF_TRACE_FATAL_RL(QDF_MODULE_ID_PE, params) +#define pe_err_rl(params...) QDF_TRACE_ERROR_RL(QDF_MODULE_ID_PE, params) +#define pe_warn_rl(params...) QDF_TRACE_WARN_RL(QDF_MODULE_ID_PE, params) +#define pe_info_rl(params...) QDF_TRACE_INFO_RL(QDF_MODULE_ID_PE, params) +#define pe_debug_rl(params...) QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_PE, params) #define pe_log(level, args...) QDF_TRACE(QDF_MODULE_ID_PE, level, ## args) #define pe_logfl(level, format, args...) pe_log(level, FL(format), ## args)