From 542da35e3956c2151036a3cda2b73abe8976ec3c Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 13 Sep 2017 09:17:28 -0700 Subject: [PATCH] qcacld-3.0: Remove wma_close() cds_ctx parameter Currently wma_close() takes a cds_ctx parameter. At one time this was needed for the call to cds_get_context(), but that is no longer the case, so remove this unused parameter. Change-Id: I31d1016cff580f9330027f8104348466df9f01dd CRs-Fixed: 2109259 --- core/cds/src/cds_api.c | 4 ++-- core/wma/inc/wma_api.h | 2 +- core/wma/src/wma_main.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 2ffd2bdc885f..ddbfedfd4397 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -649,7 +649,7 @@ err_mac_close: err_wma_close: cds_shutdown_notifier_purge(); - wma_close(gp_cds_context); + wma_close(); wma_wmi_service_close(gp_cds_context); pmo_ucfg_psoc_update_dp_handle(psoc, NULL); @@ -1123,7 +1123,7 @@ QDF_STATUS cds_close(struct wlan_objmgr_psoc *psoc, v_CONTEXT_t cds_context) QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to shutdown wma", __func__); } else { - qdf_status = wma_close(cds_context); + qdf_status = wma_close(); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma", __func__); diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h index 6ef553223773..afacef7db655 100644 --- a/core/wma/inc/wma_api.h +++ b/core/wma/inc/wma_api.h @@ -102,7 +102,7 @@ QDF_STATUS wma_start(void); QDF_STATUS wma_stop(uint8_t reason); -QDF_STATUS wma_close(void *cds_context); +QDF_STATUS wma_close(void); QDF_STATUS wma_wmi_service_close(void *cds_context); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index c50267f2e677..aba2cab6c042 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -3696,11 +3696,10 @@ static void wma_cleanup_dbs_phy_caps(t_wma_handle *wma_handle) /** * wma_close() - wma close function. * cleanup resources attached with wma. - * @cds_ctx: cds context * * Return: 0 on success, QDF Error on failure */ -QDF_STATUS wma_close(void *cds_ctx) +QDF_STATUS wma_close(void) { tp_wma_handle wma_handle; uint32_t idx;