From abb7404d2ba3b9398d2b0724dba960ca29916d82 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 31 Aug 2017 11:44:55 -0700 Subject: [PATCH] qcacld-3.0: Remove unused wma_get_wcnss_software_version() param Currently wma_get_wcnss_software_version() takes a p_cds_gctx parameter which it does not use, so remove it. Change-Id: I86a5893a9407bad034a32c105aec92d4e6054744 CRs-Fixed: 2102549 --- core/sme/src/common/sme_api.c | 3 +-- core/wma/inc/wma_api.h | 13 ++++++++++--- core/wma/src/wma_utils.c | 15 +++------------ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 76e46faa0ed4..965de62014a6 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -5504,12 +5504,11 @@ QDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, { QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - v_CONTEXT_t cds_context = cds_get_global_context(); if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) { status = - wma_get_wcnss_software_version(cds_context, + wma_get_wcnss_software_version( pVersion, versionBufferSize); } else { diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h index 4e4e6de190d8..9f725a256195 100644 --- a/core/wma/inc/wma_api.h +++ b/core/wma/inc/wma_api.h @@ -131,9 +131,16 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1, QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value); -QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, - uint8_t *pVersion, - uint32_t versionBufferSize); +/** + * wma_get_wcnss_software_version() - get wcnss software version + * @version: version pointer + * @version_buffer_size: buffer size + * + * Return: QDF_STATUS_SUCCESS for success or error code + */ +QDF_STATUS wma_get_wcnss_software_version(uint8_t *version, + uint32_t version_buffer_size); + void wma_set_peer_authorized_cb(void *wma_ctx, wma_peer_authorized_fp auth_cb); QDF_STATUS wma_set_peer_param(void *wma_ctx, uint8_t *peer_addr, uint32_t param_id, diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index dd6321d893e6..bda9b066b657 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -4149,17 +4149,8 @@ wma_process_ftm_command(tp_wma_handle wma_handle, } #endif /* QCA_WIFI_FTM */ -/** - * wma_get_wcnss_software_version() - get wcnss software version - * @p_cds_gctx: cds context - * @pVersion: version pointer - * @versionBufferSize: buffer size - * - * Return: QDF_STATUS_SUCCESS for success or error code - */ -QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, - uint8_t *pVersion, - uint32_t versionBufferSize) +QDF_STATUS wma_get_wcnss_software_version(uint8_t *version, + uint32_t version_buffer_size) { tp_wma_handle wma_handle = cds_get_context(QDF_MODULE_ID_WMA); @@ -4168,7 +4159,7 @@ QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, return QDF_STATUS_E_FAULT; } - snprintf(pVersion, versionBufferSize, "%x", + snprintf(version, version_buffer_size, "%x", (unsigned int)wma_handle->target_fw_version); return QDF_STATUS_SUCCESS; }