Эх сурвалжийг харах

qcacld-3.0: Fix function types passed to qdf_trace_register

Fix function types passed to qdf_trace_register.

Change-Id: I6d22c05a866f78113c95bd21c83bb0a28a630385
CRs-Fixed: 2208843
Srinivas Girigowda 7 жил өмнө
parent
commit
1e0456c9aa

+ 2 - 2
core/mac/src/pe/include/lim_trace.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016, 2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -85,7 +85,7 @@ void limTraceUpdateMgmtStat(tpAniSirGlobal pMac, uint8_t subtype);
 void lim_trace_dumpMgmtStat(tpAniSirGlobal pMac, uint8_t subtype);
 uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState);
 uint8_t *lim_trace_get_sme_state_string(uint32_t smeState);
-void lim_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord,
+void lim_trace_dump(void *pMac, tp_qdf_trace_record pRecord,
 		    uint16_t recIndex);
 void mac_trace_msg_tx(tpAniSirGlobal pMac, uint8_t session, uint32_t data);
 void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data);

+ 2 - 3
core/mac/src/pe/lim/lim_trace.c

@@ -104,13 +104,12 @@ static uint8_t *__lim_trace_get_mgmt_drop_reason_string(uint16_t dropReason)
 
 void lim_trace_init(tpAniSirGlobal pMac)
 {
-	qdf_trace_register(QDF_MODULE_ID_PE, (tp_qdf_trace_cb) &lim_trace_dump);
+	qdf_trace_register(QDF_MODULE_ID_PE, &lim_trace_dump);
 }
 
-void lim_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord,
+void lim_trace_dump(void *pMac, tp_qdf_trace_record pRecord,
 		    uint16_t recIndex)
 {
-
 	static char *frameSubtypeStr[LIM_TRACE_MAX_SUBTYPES] = {
 		"Association request",
 		"Association response",

+ 2 - 3
core/sme/src/common/sme_trace.c

@@ -196,7 +196,7 @@ static uint8_t *sme_trace_get_command_string(uint32_t command)
 	}
 }
 
-static void sme_trace_dump(tpAniSirGlobal mac_ctx, tp_qdf_trace_record record,
+static void sme_trace_dump(void *mac_ctx, tp_qdf_trace_record record,
 			   uint16_t rec_index)
 {
 	switch (record->code) {
@@ -233,7 +233,6 @@ static void sme_trace_dump(tpAniSirGlobal mac_ctx, tp_qdf_trace_record record,
 
 void sme_trace_init(tpAniSirGlobal pMac)
 {
-	qdf_trace_register(QDF_MODULE_ID_SME, (tp_qdf_trace_cb)
-				&sme_trace_dump);
+	qdf_trace_register(QDF_MODULE_ID_SME, &sme_trace_dump);
 }
 #endif