From 6867ec3361fd8bdb280bf4e73cffe6c396d7dfd0 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 29 Sep 2017 20:30:20 -0700 Subject: [PATCH] qcacld-3.0: Fix incorrect use of CDS logging APIs within HDD It was observed that logs from some HDD functions were tagged with the QDF module ID. Code analysis showed some HDD functions are using cds_* logging APIs instead of hdd_* logging APIs. Replace the cds APIs with the hdd APIs. Change-Id: I38edb7b5491d0d2d1412b41d3ae6e129ebc4dbe0 CRs-Fixed: 2090970 --- core/hdd/src/wlan_hdd_cfg80211.c | 2 +- core/hdd/src/wlan_hdd_ipa.c | 20 ++++++++++---------- core/hdd/src/wlan_hdd_main.c | 24 ++++++++++++------------ core/hdd/src/wlan_hdd_power.c | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 5117918d2e2b..7a3491e1f743 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -9504,7 +9504,7 @@ __wlan_hdd_cfg80211_avoid_freq(struct wiphy *wiphy, ENTER_DEV(wdev->netdev); if (!qdf_ctx) { - cds_err("qdf_ctx is NULL"); + hdd_err("qdf_ctx is NULL"); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index d87872df1264..2b58237f15f8 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -1347,13 +1347,13 @@ void hdd_ipa_set_tx_flow_info(void) hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - cds_err("HDD context is NULL"); + hdd_err("HDD context is NULL"); return; } cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { - cds_err("Invalid CDS Context"); + hdd_err("Invalid CDS Context"); return; } @@ -1451,7 +1451,7 @@ void hdd_ipa_set_tx_flow_info(void) cdp_fc_ll_set_tx_pause_q_depth(soc, adapter->sessionId, hdd_ctx->config->TxFlowMaxQueueDepth); - cds_info("MODE %d,CH %d,LWM %d,HWM %d,TXQDEP %d", + hdd_info("MODE %d,CH %d,LWM %d,HWM %d,TXQDEP %d", adapter->device_mode, targetChannel, adapter->tx_flow_low_watermark, @@ -1477,7 +1477,7 @@ void hdd_ipa_set_tx_flow_info(void) adapter->sessionId, hdd_ctx->config-> TxHbwFlowMaxQueueDepth); - cds_info("SCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d", + hdd_info("SCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d", hdd_device_mode_to_string( adapter->device_mode), adapter->device_mode, @@ -1490,7 +1490,7 @@ void hdd_ipa_set_tx_flow_info(void) TxHbwFlowMaxQueueDepth); if (!preAdapterContext) { - cds_err("SCC: Previous adapter context NULL"); + hdd_err("SCC: Previous adapter context NULL"); continue; } @@ -1503,7 +1503,7 @@ void hdd_ipa_set_tx_flow_info(void) preAdapterContext->sessionId, hdd_ctx->config-> TxHbwFlowMaxQueueDepth); - cds_info("SCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d", + hdd_info("SCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d", hdd_device_mode_to_string( preAdapterContext->device_mode ), @@ -1539,7 +1539,7 @@ void hdd_ipa_set_tx_flow_info(void) } if (!adapter5) { - cds_err("MCC: 5GHz adapter context NULL"); + hdd_err("MCC: 5GHz adapter context NULL"); continue; } adapter5->tx_flow_low_watermark = @@ -1553,7 +1553,7 @@ void hdd_ipa_set_tx_flow_info(void) adapter5->sessionId, hdd_ctx->config-> TxHbwFlowMaxQueueDepth); - cds_info("MCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d", + hdd_info("MCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d", hdd_device_mode_to_string( adapter5->device_mode), adapter5->device_mode, @@ -1567,7 +1567,7 @@ void hdd_ipa_set_tx_flow_info(void) TxHbwFlowMaxQueueDepth); if (!adapter2_4) { - cds_err("MCC: 2.4GHz adapter context NULL"); + hdd_err("MCC: 2.4GHz adapter context NULL"); continue; } adapter2_4->tx_flow_low_watermark = @@ -1581,7 +1581,7 @@ void hdd_ipa_set_tx_flow_info(void) adapter2_4->sessionId, hdd_ctx->config-> TxLbwFlowMaxQueueDepth); - cds_info("MCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d", + hdd_info("MCC: MODE %s(%d), CH %d, LWM %d, HWM %d, TXQDEP %d", hdd_device_mode_to_string( adapter2_4->device_mode), adapter2_4->device_mode, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index da51b9788bfd..1e1591ddf13e 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -12383,17 +12383,17 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter) SME_CMD_TIMEOUT_VALUE); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - cds_err("SAP Stop Failed"); + hdd_err("SAP Stop Failed"); goto end; } } clear_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags); policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc, ap_adapter->device_mode, ap_adapter->sessionId); - cds_err("SAP Stop Success"); + hdd_err("SAP Stop Success"); if (0 != wlan_hdd_cfg80211_update_apies(ap_adapter)) { - cds_err("SAP Not able to set AP IEs"); + hdd_err("SAP Not able to set AP IEs"); wlansap_reset_sap_config_add_ie(sap_config, eUPDATE_IE_ALL); goto end; @@ -12403,23 +12403,23 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter) if (wlansap_start_bss(sap_ctx, hdd_hostapd_sap_event_cb, sap_config, ap_adapter->dev) != QDF_STATUS_SUCCESS) { - cds_err("SAP Start Bss fail"); + hdd_err("SAP Start Bss fail"); wlansap_reset_sap_config_add_ie(sap_config, eUPDATE_IE_ALL); goto end; } - cds_info("Waiting for SAP to start"); + hdd_info("Waiting for SAP to start"); qdf_status = qdf_wait_single_event(&hostapd_state->qdf_event, SME_CMD_TIMEOUT_VALUE); wlansap_reset_sap_config_add_ie(sap_config, eUPDATE_IE_ALL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - cds_err("SAP Start failed"); + hdd_err("SAP Start failed"); goto end; } - cds_err("SAP Start Success"); + hdd_err("SAP Start Success"); set_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags); if (hostapd_state->bssState == BSS_START) policy_mgr_incr_active_session(hdd_ctx->hdd_psoc, @@ -12448,19 +12448,19 @@ void hdd_check_and_restart_sap_with_non_dfs_acs(void) hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - cds_err("HDD context is NULL"); + hdd_err("HDD context is NULL"); return; } cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { - cds_err("Invalid CDS Context"); + hdd_err("Invalid CDS Context"); return; } if (policy_mgr_get_concurrency_mode(hdd_ctx->hdd_psoc) != (QDF_STA_MASK | QDF_SAP_MASK)) { - cds_info("Concurrency mode is not SAP"); + hdd_info("Concurrency mode is not SAP"); return; } @@ -12470,7 +12470,7 @@ void hdd_check_and_restart_sap_with_non_dfs_acs(void) wlan_reg_is_dfs_ch(hdd_ctx->hdd_pdev, ap_adapter->sessionCtx.ap.operatingChannel)) { - cds_warn("STA-AP Mode DFS not supported. Restart SAP with Non DFS ACS"); + hdd_warn("STA-AP Mode DFS not supported. Restart SAP with Non DFS ACS"); ap_adapter->sessionCtx.ap.sapConfig.channel = AUTO_CHANNEL_SELECT; ap_adapter->sessionCtx.ap.sapConfig. @@ -12497,7 +12497,7 @@ bool hdd_set_connection_in_progress(bool value) hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - cds_err("HDD context is NULL"); + hdd_err("HDD context is NULL"); return false; } diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 5cd7574f1f0c..31c3713a8a28 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1707,7 +1707,7 @@ static void hdd_suspend_cb(void) hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - cds_err("HDD context is NULL"); + hdd_err("HDD context is NULL"); return; }