Browse Source

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
Jeff Johnson 7 years ago
parent
commit
abb7404d2b
3 changed files with 14 additions and 17 deletions
  1. 1 2
      core/sme/src/common/sme_api.c
  2. 10 3
      core/wma/inc/wma_api.h
  3. 3 12
      core/wma/src/wma_utils.c

+ 1 - 2
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 {

+ 10 - 3
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,

+ 3 - 12
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;
 }