Browse Source

qcacld-3.0: Remove unused wma_register_roaming_callbacks param

Currently wma_register_roaming_callbacks() has a cds_ctx parameter. At
one time this was necessary since the global context was required to
get the module-specific context.  However the global context is no
longer required for this purpose, so remove the unused parameter.

Change-Id: Ida681fb20dd98a46f385f1e04662f72a334c68bf
CRs-Fixed: 2103626
Jeff Johnson 7 years ago
parent
commit
a9b6657591
3 changed files with 8 additions and 12 deletions
  1. 5 8
      core/mac/src/pe/lim/lim_api.c
  2. 2 2
      core/wma/inc/wma_types.h
  3. 1 2
      core/wma/src/wma_mgmt.c

+ 5 - 8
core/mac/src/pe/lim/lim_api.c

@@ -1248,19 +1248,16 @@ void pe_deregister_mgmt_rx_frm_callback(tpAniSirGlobal mac_ctx)
 void pe_register_callbacks_with_wma(tpAniSirGlobal pMac,
 				    tSirSmeReadyReq *ready_req)
 {
-	void *p_cds_gctx;
-	QDF_STATUS retStatus;
-
-	p_cds_gctx = cds_get_global_context();
+	QDF_STATUS status;
 
-	retStatus = wma_register_roaming_callbacks(p_cds_gctx,
+	status = wma_register_roaming_callbacks(
 			ready_req->csr_roam_synch_cb,
 			ready_req->pe_roam_synch_cb);
-	if (retStatus != QDF_STATUS_SUCCESS)
+	if (status != QDF_STATUS_SUCCESS)
 		pe_err("Registering roaming callbacks with WMA failed");
 
-	retStatus = wma_register_ndp_cb(lim_handle_ndp_event_message);
-	if (retStatus != QDF_STATUS_SUCCESS)
+	status = wma_register_ndp_cb(lim_handle_ndp_event_message);
+	if (status != QDF_STATUS_SUCCESS)
 		pe_err("Registering NDP callbacks with WMA failed");
 }
 

+ 2 - 2
core/wma/inc/wma_types.h

@@ -735,7 +735,7 @@ QDF_STATUS wma_register_mgmt_frm_client(void);
 
 QDF_STATUS wma_de_register_mgmt_frm_client(void);
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx,
+QDF_STATUS wma_register_roaming_callbacks(
 		QDF_STATUS (*csr_roam_synch_cb)(tpAniSirGlobal mac,
 			roam_offload_synch_ind *roam_synch_data,
 			tpSirBssDescription  bss_desc_ptr,
@@ -744,7 +744,7 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx,
 			roam_offload_synch_ind *roam_synch_data,
 			tpSirBssDescription  bss_desc_ptr));
 #else
-static inline QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx,
+static inline QDF_STATUS wma_register_roaming_callbacks(
 		QDF_STATUS (*csr_roam_synch_cb)(tpAniSirGlobal mac,
 			roam_offload_synch_ind *roam_synch_data,
 			tpSirBssDescription  bss_desc_ptr,

+ 1 - 2
core/wma/src/wma_mgmt.c

@@ -3767,7 +3767,6 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void)
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 /**
  * wma_register_roaming_callbacks() - Register roaming callbacks
- * @cds_ctx: CDS Context
  * @csr_roam_synch_cb: CSR roam synch callback routine pointer
  * @pe_roam_synch_cb: PE roam synch callback routine pointer
  *
@@ -3776,7 +3775,7 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void)
  *
  * Return: Success or Failure Status
  */
-QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx,
+QDF_STATUS wma_register_roaming_callbacks(
 	QDF_STATUS (*csr_roam_synch_cb)(tpAniSirGlobal mac,
 		roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription  bss_desc_ptr,