From 2f2cddb2ea4e6d3b9002b58ee74889ce7882b67b Mon Sep 17 00:00:00 2001 From: Wu Gao Date: Fri, 25 Jan 2019 14:08:01 +0800 Subject: [PATCH] qcacld-3.0: Cleanup unused WNI_CFG_DNLD_REQ WNI CFG needn't to download since all wni cfg refactored based on new cfg framework, so remove WNI_CFG_DNLD_REQ. Change-Id: Icd85b7797fcbc41debe55edb6b1f68478797d726 CRs-Fixed: 2387589 --- core/cds/src/cds_api.c | 32 ------------------- core/mac/inc/wni_api.h | 7 ---- .../src/sys/legacy/src/utils/src/mac_trace.c | 1 - core/wma/inc/wma.h | 2 -- core/wma/src/wma_main.c | 17 ---------- 5 files changed, 59 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index b8d25aa319dd..9bf6f9e15171 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -814,9 +814,6 @@ QDF_STATUS cds_pre_enable(void) cdp_pkt_log_con_service(soc, gp_cds_context->pdev_txrx_ctx, scn); - /* Reset wma wait event */ - qdf_event_reset(&gp_cds_context->wma_complete_event); - /*call WMA pre start */ status = wma_pre_start(); if (QDF_IS_STATUS_ERROR(status)) { @@ -824,16 +821,6 @@ QDF_STATUS cds_pre_enable(void) return QDF_STATUS_E_FAILURE; } - /* Need to update time out of complete */ - status = qdf_wait_for_event_completion( - &gp_cds_context->wma_complete_event, - CDS_WMA_TIMEOUT); - if (QDF_IS_STATUS_ERROR(status)) { - cds_err("Failed to wait for WMA complete; status:%u", status); - cds_trigger_recovery(QDF_REASON_UNSPECIFIED); - goto exit_with_status; - } - status = htc_start(gp_cds_context->htc_ctx); if (QDF_IS_STATUS_ERROR(status)) { cds_err("Failed to Start HTC"); @@ -1582,25 +1569,6 @@ QDF_STATUS cds_free_context(QDF_MODULE_ID module_id, void *module_context) return QDF_STATUS_SUCCESS; } /* cds_free_context() */ -/** - * cds_wma_complete_cback() - wma complete callback - * - * Return: none - */ -void cds_wma_complete_cback(void) -{ - if (!gp_cds_context) { - cds_err("invalid gp_cds_context"); - return; - } - - if (qdf_event_set(&gp_cds_context->wma_complete_event) != - QDF_STATUS_SUCCESS) { - cds_err("qdf_event_set failed"); - return; - } -} /* cds_wma_complete_cback() */ - /** * cds_get_vdev_types() - get vdev type * @mode: mode diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index 09888fbec08a..704fb546e944 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -225,13 +225,6 @@ enum eWniMsgTypes { eWNI_SME_MSG_TYPES_END }; -#define WNI_CFG_MSG_TYPES_BEGIN 0x1200 - -/*---------------------------------------------------------------------*/ -/* CFG to HDD message types */ -/*---------------------------------------------------------------------*/ -#define WNI_CFG_DNLD_REQ (WNI_CFG_MSG_TYPES_BEGIN | 0x01) - typedef struct sAniCfgTxRateCtrs { /* add the rate counters here */ unsigned long TxFrames_1Mbps; diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 71d88697863c..29bdc6351763 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -556,7 +556,6 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) CASE_RETURN_STRING(WMA_UPDATE_WEP_DEFAULT_KEY); CASE_RETURN_STRING(WMA_SEND_FREQ_RANGE_CONTROL_IND); CASE_RETURN_STRING(WMA_POWER_DEBUG_STATS_REQ); - CASE_RETURN_STRING(WNI_CFG_DNLD_REQ); #ifdef WLAN_FEATURE_ROAM_OFFLOAD CASE_RETURN_STRING(SIR_HAL_ROAM_INVOKE); #endif diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 5264959f8fa7..611f2f8583c1 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1226,8 +1226,6 @@ typedef struct { bool fw_therm_throt_support; } t_wma_handle, *tp_wma_handle; -extern void cds_wma_complete_cback(void); - /** * wma_vdev_nss_chain_params_send() - send vdev nss chain params to fw. * @vdev_id: vdev_id diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index d8668e03e9f6..1e97aa89d504 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -3737,7 +3737,6 @@ QDF_STATUS wma_pre_start(void) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle; - struct scheduler_msg wma_msg = { 0 }; void *htc_handle; WMA_LOGD("%s: Enter", __func__); @@ -3772,18 +3771,6 @@ QDF_STATUS wma_pre_start(void) WMA_LOGD("WMA --> wmi_unified_connect_htc_service - success"); - /* Trigger the CFG DOWNLOAD */ - wma_msg.type = WNI_CFG_DNLD_REQ; - wma_msg.bodyptr = NULL; - wma_msg.bodyval = 0; - - qdf_status = scheduler_post_message(QDF_MODULE_ID_WMA, - QDF_MODULE_ID_WMA, - QDF_MODULE_ID_WMA, &wma_msg); - if (QDF_STATUS_SUCCESS != qdf_status) { - QDF_ASSERT(0); - qdf_status = QDF_STATUS_E_FAILURE; - } end: WMA_LOGD("%s: Exit", __func__); return qdf_status; @@ -8305,10 +8292,6 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg) wma_process_tsm_stats_req(wma_handle, (void *)msg->bodyptr); break; #endif /* FEATURE_WLAN_ESE */ - case WNI_CFG_DNLD_REQ: - WMA_LOGD("McThread: WNI_CFG_DNLD_REQ"); - cds_wma_complete_cback(); - break; case WMA_ADD_STA_SELF_REQ: txrx_vdev_handle = wma_vdev_attach(wma_handle,