From ea5c2aa194f03bcd94177ad00cdeb801bb21a259 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 13 Sep 2017 14:18:59 -0700 Subject: [PATCH] qcacld-3.0: Remove cds_context param to cds_disable() Currently cds_disable() takes a cds_context param. However CDS already maintains its own context, hence this param introduces an unnecessary coupling, so remove it. Change-Id: I539b3c19a52a9c663268bade6a0acfaa411906dd CRs-Fixed: 2109429 --- core/cds/inc/cds_api.h | 2 +- core/cds/src/cds_api.c | 3 +-- core/hdd/src/wlan_hdd_main.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index bcd8edfd1271..8bfbc17abe66 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -315,7 +315,7 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc); QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc); -QDF_STATUS cds_disable(struct wlan_objmgr_psoc *psoc, v_CONTEXT_t cds_context); +QDF_STATUS cds_disable(struct wlan_objmgr_psoc *psoc); QDF_STATUS cds_post_disable(void); diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 6361c9c50494..20fca6b79396 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -940,11 +940,10 @@ err_wma_stop: /** * cds_disable() - stop/disable cds module * @psoc: Psoc pointer - * @cds_context: CDS context * * Return: QDF status */ -QDF_STATUS cds_disable(struct wlan_objmgr_psoc *psoc, v_CONTEXT_t cds_context) +QDF_STATUS cds_disable(struct wlan_objmgr_psoc *psoc) { QDF_STATUS qdf_status; void *handle; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 703e2616afc5..3401851ddf6e 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -9244,7 +9244,7 @@ int hdd_configure_cds(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter) return 0; cds_disable: - cds_disable(hdd_ctx->hdd_psoc, hdd_ctx->pcds_context); + cds_disable(hdd_ctx->hdd_psoc); out: return -EINVAL; @@ -9271,7 +9271,7 @@ static int hdd_deconfigure_cds(struct hdd_context *hdd_ctx) /* De-register the SME callbacks */ hdd_deregister_cb(hdd_ctx); - qdf_status = cds_disable(hdd_ctx->hdd_psoc, hdd_ctx->pcds_context); + qdf_status = cds_disable(hdd_ctx->hdd_psoc); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_err("Failed to Disable the CDS Modules! :%d", qdf_status);