Преглед на файлове

qcacld-3.0: Remove cds_wma_complete_cback() parameter

Currently cds_wma_complete_cback() takes a parameter that is a pointer
to the CDS context. However CDS already maintains its own context,
hence this param introduces an unnecessary coupling, so remove it.

Change-Id: I1b4588f18f807008fd212a8e5d04e3895a12922c
CRs-Fixed: 2109257
Jeff Johnson преди 7 години
родител
ревизия
f7ab814a0c
променени са 3 файла, в които са добавени 5 реда и са изтрити 6 реда
  1. 3 4
      core/cds/src/cds_api.c
  2. 1 1
      core/wma/inc/wma.h
  3. 1 1
      core/wma/src/wma_main.c

+ 3 - 4
core/cds/src/cds_api.c

@@ -1639,15 +1639,14 @@ void cds_sys_probe_thread_cback(void *pUserData)
 
 /**
  * cds_wma_complete_cback() - wma complete callback
- * @pUserData: pointer to user data
  *
  * Return: none
  */
-void cds_wma_complete_cback(void *pUserData)
+void cds_wma_complete_cback(void)
 {
-	if (gp_cds_context != pUserData) {
+	if (!gp_cds_context) {
 		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
-			  "%s: gp_cds_context != pUserData", __func__);
+			  "%s: invalid gp_cds_context", __func__);
 		return;
 	}
 

+ 1 - 1
core/wma/inc/wma.h

@@ -1611,7 +1611,7 @@ typedef struct qdf_packed sHalMacStartParameter {
 	 */
 } tHalMacStartParameter, *tpHalMacStartParameter;
 
-extern void cds_wma_complete_cback(void *p_cds_context);
+extern void cds_wma_complete_cback(void);
 extern void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G,
 					  uint16_t regdmn5G, uint8_t ctl2G,
 					  uint8_t ctl5G);

+ 1 - 1
core/wma/src/wma_main.c

@@ -6774,7 +6774,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, struct scheduler_msg *msg)
 		WMA_LOGD("McThread: WNI_CFG_DNLD_REQ");
 		qdf_status = wma_wni_cfg_dnld(wma_handle);
 		if (QDF_IS_STATUS_SUCCESS(qdf_status))
-			cds_wma_complete_cback(cds_context);
+			cds_wma_complete_cback();
 		else
 			WMA_LOGD("config download failure");
 		break;