diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 6f560f1b0cbd..394a09ac6cad 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -426,7 +426,7 @@ static void cds_cdp_cfg_attach(struct wlan_objmgr_psoc *psoc) gp_cds_context->cfg_ctx = cdp_cfg_attach(soc, gp_cds_context->qdf_ctx, (void *)(&cdp_cfg)); if (!gp_cds_context->cfg_ctx) { - WMA_LOGD("%s: failed to init cfg handle", __func__); + cds_debug("failed to init cfg handle"); return; } diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index a1aa3de5a362..647d0c6786a5 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -74,8 +74,6 @@ #define WMA_INVALID_VDEV_ID 0xFF /* Deprecated logging macros, to be removed. Please do not use in new code */ -#define WMA_LOGD(params ...) \ - QDF_TRACE_DEBUG_NO_FL(QDF_MODULE_ID_WMA, params) #define WMA_LOGI(params ...) \ QDF_TRACE_INFO_NO_FL(QDF_MODULE_ID_WMA, params) #define WMA_LOGW(params ...) \ diff --git a/core/wma/inc/wma_twt.h b/core/wma/inc/wma_twt.h index 43f64d8f0c40..aaffe22d20af 100644 --- a/core/wma/inc/wma_twt.h +++ b/core/wma/inc/wma_twt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -74,7 +74,7 @@ static inline void wma_send_twt_enable_cmd(uint32_t pdev_id, uint32_t congestion_timeout, bool bcast_val) { - WMA_LOGD(FL("TWT not supported as WLAN_SUPPORT_TWT is disabled")); + wma_debug("TWT not supported as WLAN_SUPPORT_TWT is disabled"); } static inline void wma_send_twt_disable_cmd(uint32_t pdev_id) @@ -89,7 +89,7 @@ static inline void wma_set_twt_peer_caps(tpAddStaParams params, static inline QDF_STATUS wma_twt_process_add_dialog( struct wmi_twt_add_dialog_param *params) { - WMA_LOGD(FL("TWT not supported as WLAN_SUPPORT_TWT is disabled")); + wma_debug("TWT not supported as WLAN_SUPPORT_TWT is disabled"); return QDF_STATUS_E_INVAL; } @@ -97,7 +97,7 @@ static inline QDF_STATUS wma_twt_process_add_dialog( static inline QDF_STATUS wma_twt_process_del_dialog( struct wmi_twt_del_dialog_param *params) { - WMA_LOGD(FL("TWT not supported as WLAN_SUPPORT_TWT is disabled")); + wma_debug("TWT not supported as WLAN_SUPPORT_TWT is disabled"); return QDF_STATUS_E_INVAL; } diff --git a/core/wma/src/wlan_qct_wma_legacy.c b/core/wma/src/wlan_qct_wma_legacy.c index 9e01fbaad8c1..c47bec2f2fdd 100644 --- a/core/wma/src/wlan_qct_wma_legacy.c +++ b/core/wma/src/wlan_qct_wma_legacy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -96,7 +96,7 @@ QDF_STATUS u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb) break; default: - WMA_LOGD("Unknown message type = 0x%X\n", msg.type); + wma_debug("Unknown message type = 0x%X", msg.type); qdf_mem_free(msg.bodyptr); return QDF_STATUS_E_FAILURE; } diff --git a/core/wma/src/wma_fw_state.c b/core/wma/src/wma_fw_state.c index 68e8145465fd..8d8c507e3115 100644 --- a/core/wma/src/wma_fw_state.c +++ b/core/wma/src/wma_fw_state.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -73,7 +73,7 @@ static int wma_echo_event_handler(void *handle, uint8_t *buf, uint32_t len) }; QDF_STATUS qdf_status; - WMA_LOGD("Received Echo reply from firmware!"); + wma_debug("Received Echo reply from firmware!"); qdf_status = scheduler_post_message(QDF_MODULE_ID_WMA, QDF_MODULE_ID_SME, diff --git a/core/wma/src/wma_nan_datapath.c b/core/wma/src/wma_nan_datapath.c index 8812954fccb0..cd16c90e31e7 100644 --- a/core/wma/src/wma_nan_datapath.c +++ b/core/wma/src/wma_nan_datapath.c @@ -95,13 +95,13 @@ void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta) goto send_rsp; } - WMA_LOGD(FL("Moving peer %pM to state %d"), add_sta->staMac, state); + wma_debug("Moving peer %pM to state %d", add_sta->staMac, state); cdp_peer_state_update(soc, add_sta->staMac, state); add_sta->nss = iface->nss; add_sta->status = QDF_STATUS_SUCCESS; send_rsp: - WMA_LOGD(FL("Sending add sta rsp to umac (mac:%pM, status:%d)"), + wma_debug("Sending add sta rsp to umac (mac:%pM, status:%d)", add_sta->staMac, add_sta->status); wma_send_msg_high_priority(wma, WMA_ADD_STA_RSP, (void *)add_sta, 0); } @@ -123,11 +123,11 @@ void wma_delete_sta_req_ndi_mode(tp_wma_handle wma, del_sta->status = QDF_STATUS_SUCCESS; if (del_sta->respReqd) { - WMA_LOGD(FL("Sending del rsp to umac (status: %d)"), + wma_debug("Sending del rsp to umac (status: %d)", del_sta->status); wma_send_msg_high_priority(wma, WMA_DELETE_STA_RSP, del_sta, 0); } else { - WMA_LOGD(FL("NDI Del Sta resp not needed")); + wma_debug("NDI Del Sta resp not needed"); qdf_mem_free(del_sta); } diff --git a/core/wma/src/wma_twt.c b/core/wma/src/wma_twt.c index 84e88a6951f7..45b9e9fd3c44 100644 --- a/core/wma/src/wma_twt.c +++ b/core/wma/src/wma_twt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -74,7 +74,7 @@ int wma_twt_en_complete_event_handler(void *handle, wmi_handle, event, ¶m); - WMA_LOGD("TWT: Received TWT enable comp event, status:%d", status); + wma_debug("TWT: Received TWT enable comp event, status:%d", status); if (mac->sme.twt_enable_cb) mac->sme.twt_enable_cb(mac->hdd_handle, ¶m); @@ -110,7 +110,7 @@ int wma_twt_disable_comp_event_handler(void *handle, uint8_t *event, return -EINVAL; } - WMA_LOGD("TWT: Rcvd TWT disable comp event"); + wma_debug("TWT: Rcvd TWT disable comp event"); if (mac->sme.twt_disable_cb) mac->sme.twt_disable_cb(mac->hdd_handle);