qcacld-3.0: Rename pMac in PE & SME RRM files

Per the Linux coding style "mixed-case names are frowned upon" and
"so-called Hungarian notation [...] is brain damaged." One identifier
used extensively throughout the driver that violates both of these
tenants is "pMac." In order to be compliant with the Linux coding
style there is a campaign to rename all instances of this identifier.

For this change rename all instances of "pMac" to "mac" in:
rrm_api.h
rrm_api.c
sme_rrm_api.h
sme_rrm.c

Change-Id: I7eb6e7bf6f5d921b7a8f1f4c98d6a120e104a4ea
CRs-Fixed: 2355450

core/mac/src/pe/include/rrm_api.h

@@ -35,59 +35,59 @@
 #define RRM_BCN_RPT_NO_BSS_INFO    0
 #define RRM_BCN_RPT_MIN_RPT        1
 
-uint8_t rrm_get_min_of_max_tx_power(tpAniSirGlobal pMac, int8_t regMax,
+uint8_t rrm_get_min_of_max_tx_power(tpAniSirGlobal mac, int8_t regMax,
 				    int8_t apTxPower);
 
-QDF_STATUS rrm_initialize(tpAniSirGlobal pMac);
+QDF_STATUS rrm_initialize(tpAniSirGlobal mac);
 
-QDF_STATUS rrm_cleanup(tpAniSirGlobal pMac);
+QDF_STATUS rrm_cleanup(tpAniSirGlobal mac);
 
-QDF_STATUS rrm_process_link_measurement_request(tpAniSirGlobal pMac,
+QDF_STATUS rrm_process_link_measurement_request(tpAniSirGlobal mac,
 						uint8_t *pRxPacketInfo,
 						tDot11fLinkMeasurementRequest
 							  *pLinkReq,
 						tpPESession
 							  pSessionEntry);
 
-QDF_STATUS rrm_process_radio_measurement_request(tpAniSirGlobal pMac,
+QDF_STATUS rrm_process_radio_measurement_request(tpAniSirGlobal mac,
 						 tSirMacAddr peer,
 						 tDot11fRadioMeasurementRequest
 							   *pRRMReq,
 						 tpPESession
 							   pSessionEntry);
 
-QDF_STATUS rrm_process_neighbor_report_response(tpAniSirGlobal pMac,
+QDF_STATUS rrm_process_neighbor_report_response(tpAniSirGlobal mac,
 						tDot11fNeighborReportResponse
 							  *pNeighborRep,
 						tpPESession
 							  pSessionEntry);
 
-QDF_STATUS rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac,
+QDF_STATUS rrm_send_set_max_tx_power_req(tpAniSirGlobal mac,
 					 int8_t txPower,
 					 tpPESession pSessionEntry);
 
-int8_t rrm_get_mgmt_tx_power(tpAniSirGlobal pMac,
+int8_t rrm_get_mgmt_tx_power(tpAniSirGlobal mac,
 			     tpPESession pSessionEntry);
 
-void rrm_cache_mgmt_tx_power(tpAniSirGlobal pMac,
+void rrm_cache_mgmt_tx_power(tpAniSirGlobal mac,
 			     int8_t txPower, tpPESession pSessionEntry);
 
-tpRRMCaps rrm_get_capabilities(tpAniSirGlobal pMac,
+tpRRMCaps rrm_get_capabilities(tpAniSirGlobal mac,
 			       tpPESession pSessionEntry);
 
-void rrm_get_start_tsf(tpAniSirGlobal pMac, uint32_t *pStartTSF);
+void rrm_get_start_tsf(tpAniSirGlobal mac, uint32_t *pStartTSF);
 
-void rrm_update_start_tsf(tpAniSirGlobal pMac, uint32_t startTSF[2]);
+void rrm_update_start_tsf(tpAniSirGlobal mac, uint32_t startTSF[2]);
 
-QDF_STATUS rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac,
+QDF_STATUS rrm_set_max_tx_power_rsp(tpAniSirGlobal mac,
 				    struct scheduler_msg *limMsgQ);
 
 QDF_STATUS
-rrm_process_neighbor_report_req(tpAniSirGlobal pMac,
+rrm_process_neighbor_report_req(tpAniSirGlobal mac,
 				tpSirNeighborReportReqInd pNeighborReq);
 
 QDF_STATUS
-rrm_process_beacon_report_xmit(tpAniSirGlobal pMac,
+rrm_process_beacon_report_xmit(tpAniSirGlobal mac,
 			       tpSirBeaconReportXmitInd pBcnReport);
 
 void lim_update_rrm_capability(tpAniSirGlobal mac_ctx,

core/mac/src/pe/rrm/rrm_api.c

@@ -46,7 +46,7 @@
 #define MAX_RRM_TX_PWR_CAP 22
 
 uint8_t
-rrm_get_min_of_max_tx_power(tpAniSirGlobal pMac,
+rrm_get_min_of_max_tx_power(tpAniSirGlobal mac,
 			    int8_t regMax, int8_t apTxPower)
 {
 	uint8_t maxTxPower = 0;
@@ -80,13 +80,13 @@ rrm_get_min_of_max_tx_power(tpAniSirGlobal pMac,
  * @return None
  */
 void
-rrm_cache_mgmt_tx_power(tpAniSirGlobal pMac, int8_t txPower,
+rrm_cache_mgmt_tx_power(tpAniSirGlobal mac, int8_t txPower,
 			tpPESession pSessionEntry)
 {
 	pe_debug("Cache Mgmt Tx Power: %d", txPower);
 
 	if (pSessionEntry == NULL)
-		pMac->rrm.rrmPEContext.txMgmtPower = txPower;
+		mac->rrm.rrmPEContext.txMgmtPower = txPower;
 	else
 		pSessionEntry->txMgmtPower = txPower;
 }
@@ -106,10 +106,10 @@ rrm_cache_mgmt_tx_power(tpAniSirGlobal pMac, int8_t txPower,
  * @param pSessionEntry session entry.
  * @return txPower
  */
-int8_t rrm_get_mgmt_tx_power(tpAniSirGlobal pMac, tpPESession pSessionEntry)
+int8_t rrm_get_mgmt_tx_power(tpAniSirGlobal mac, tpPESession pSessionEntry)
 {
 	if (pSessionEntry == NULL)
-		return pMac->rrm.rrmPEContext.txMgmtPower;
+		return mac->rrm.rrmPEContext.txMgmtPower;
 
 	pe_debug("tx mgmt pwr %d", pSessionEntry->txMgmtPower);
 
@@ -133,7 +133,7 @@ int8_t rrm_get_mgmt_tx_power(tpAniSirGlobal pMac, tpPESession pSessionEntry)
  * @return None
  */
 QDF_STATUS
-rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
+rrm_send_set_max_tx_power_req(tpAniSirGlobal mac, int8_t txPower,
 			      tpPESession pSessionEntry)
 {
 	tpMaxTxPowerParams pMaxTxParams;
@@ -163,8 +163,8 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
 	pe_debug("Sending WMA_SET_MAX_TX_POWER_REQ with power(%d) to HAL",
 		txPower);
 
-	MTRACE(mac_trace_msg_tx(pMac, pSessionEntry->peSessionId, msgQ.type));
-	retCode = wma_post_ctrl_msg(pMac, &msgQ);
+	MTRACE(mac_trace_msg_tx(mac, pSessionEntry->peSessionId, msgQ.type));
+	retCode = wma_post_ctrl_msg(mac, &msgQ);
 	if (QDF_STATUS_SUCCESS != retCode) {
 		pe_err("Posting WMA_SET_MAX_TX_POWER_REQ to HAL failed, reason=%X",
 			retCode);
@@ -190,7 +190,7 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
  * @param pSessionEntry session entry.
  * @return None
  */
-QDF_STATUS rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac,
+QDF_STATUS rrm_set_max_tx_power_rsp(tpAniSirGlobal mac,
 				    struct scheduler_msg *limMsgQ)
 {
 	QDF_STATUS retCode = QDF_STATUS_SUCCESS;
@@ -199,21 +199,21 @@ QDF_STATUS rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac,
 	uint8_t sessionId, i;
 
 	if (qdf_is_macaddr_broadcast(&pMaxTxParams->bssId)) {
-		for (i = 0; i < pMac->lim.maxBssId; i++) {
-			if (pMac->lim.gpSession[i].valid == true) {
-				pSessionEntry = &pMac->lim.gpSession[i];
-				rrm_cache_mgmt_tx_power(pMac, pMaxTxParams->power,
+		for (i = 0; i < mac->lim.maxBssId; i++) {
+			if (mac->lim.gpSession[i].valid == true) {
+				pSessionEntry = &mac->lim.gpSession[i];
+				rrm_cache_mgmt_tx_power(mac, pMaxTxParams->power,
 							pSessionEntry);
 			}
 		}
 	} else {
-		pSessionEntry = pe_find_session_by_bssid(pMac,
+		pSessionEntry = pe_find_session_by_bssid(mac,
 							 pMaxTxParams->bssId.bytes,
 							 &sessionId);
 		if (pSessionEntry == NULL) {
 			retCode = QDF_STATUS_E_FAILURE;
 		} else {
-			rrm_cache_mgmt_tx_power(pMac, pMaxTxParams->power,
+			rrm_cache_mgmt_tx_power(mac, pMaxTxParams->power,
 						pSessionEntry);
 		}
 	}
@@ -241,7 +241,7 @@ QDF_STATUS rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac,
  * @return None
  */
 QDF_STATUS
-rrm_process_link_measurement_request(tpAniSirGlobal pMac,
+rrm_process_link_measurement_request(tpAniSirGlobal mac,
 				     uint8_t *pRxPacketInfo,
 				     tDot11fLinkMeasurementRequest *pLinkReq,
 				     tpPESession pSessionEntry)
@@ -260,11 +260,11 @@ rrm_process_link_measurement_request(tpAniSirGlobal pMac,
 
 	LinkReport.txPower = lim_get_max_tx_power(pSessionEntry->def_max_tx_pwr,
 						pLinkReq->MaxTxPower.maxTxPower,
-						  pMac->roam.configParam.
+						  mac->roam.configParam.
 						  nTxPowerCap);
 
 	if ((LinkReport.txPower != (uint8_t) (pSessionEntry->maxTxPower)) &&
-	    (QDF_STATUS_SUCCESS == rrm_send_set_max_tx_power_req(pMac,
+	    (QDF_STATUS_SUCCESS == rrm_send_set_max_tx_power_req(mac,
 							   LinkReport.txPower,
 							   pSessionEntry))) {
 		pe_warn("maxTx power in link report is not same as local..."
@@ -295,7 +295,7 @@ rrm_process_link_measurement_request(tpAniSirGlobal pMac,
 
 	pe_debug("Sending Link report frame");
 
-	return lim_send_link_report_action_frame(pMac, &LinkReport, pHdr->sa,
+	return lim_send_link_report_action_frame(mac, &LinkReport, pHdr->sa,
 						 pSessionEntry);
 }
 
@@ -316,7 +316,7 @@ rrm_process_link_measurement_request(tpAniSirGlobal pMac,
  * @return None
  */
 QDF_STATUS
-rrm_process_neighbor_report_response(tpAniSirGlobal pMac,
+rrm_process_neighbor_report_response(tpAniSirGlobal mac,
 				     tDot11fNeighborReportResponse *pNeighborRep,
 				     tpPESession pSessionEntry)
 {
@@ -334,7 +334,7 @@ rrm_process_neighbor_report_response(tpAniSirGlobal pMac,
 	pe_debug("Neighbor report response received");
 
 	/* Dialog token */
-	if (pMac->rrm.rrmPEContext.DialogToken !=
+	if (mac->rrm.rrmPEContext.DialogToken !=
 	    pNeighborRep->DialogToken.token) {
 		pe_err("Dialog token mismatch in the received Neighbor report");
 		return QDF_STATUS_E_FAILURE;
@@ -409,9 +409,9 @@ rrm_process_neighbor_report_response(tpAniSirGlobal pMac,
 	/* Send request to SME. */
 	mmhMsg.type = pSmeNeighborRpt->messageType;
 	mmhMsg.bodyptr = pSmeNeighborRpt;
-	MTRACE(mac_trace(pMac, TRACE_CODE_TX_SME_MSG,
+	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
 			 pSessionEntry->peSessionId, mmhMsg.type));
-	status = lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT);
+	status = lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
 
 	return status;
 
@@ -433,7 +433,7 @@ rrm_process_neighbor_report_response(tpAniSirGlobal pMac,
  * @return None
  */
 QDF_STATUS
-rrm_process_neighbor_report_req(tpAniSirGlobal pMac,
+rrm_process_neighbor_report_req(tpAniSirGlobal mac,
 				tpSirNeighborReportReqInd pNeighborReq)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -445,7 +445,7 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac,
 		pe_err("NeighborReq is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
-	pSessionEntry = pe_find_session_by_bssid(pMac, pNeighborReq->bssId,
+	pSessionEntry = pe_find_session_by_bssid(mac, pNeighborReq->bssId,
 						 &sessionId);
 	if (pSessionEntry == NULL) {
 		pe_err("session does not exist for given bssId");
@@ -456,7 +456,7 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac,
 
 	qdf_mem_set(&NeighborReportReq, sizeof(tSirMacNeighborReportReq), 0);
 
-	NeighborReportReq.dialogToken = ++pMac->rrm.rrmPEContext.DialogToken;
+	NeighborReportReq.dialogToken = ++mac->rrm.rrmPEContext.DialogToken;
 	NeighborReportReq.ssid_present = !pNeighborReq->noSSID;
 	if (NeighborReportReq.ssid_present) {
 		qdf_mem_copy(&NeighborReportReq.ssid, &pNeighborReq->ucSSID,
@@ -468,7 +468,7 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac,
 	}
 
 	status =
-		lim_send_neighbor_report_request_frame(pMac, &NeighborReportReq,
+		lim_send_neighbor_report_request_frame(mac, &NeighborReportReq,
 						       pNeighborReq->bssId,
 						       pSessionEntry);
 
@@ -494,7 +494,7 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac,
  * @return None
  */
 static tRrmRetStatus
-rrm_process_beacon_report_req(tpAniSirGlobal pMac,
+rrm_process_beacon_report_req(tpAniSirGlobal mac,
 			      tpRRMReq pCurrentReq,
 			      tDot11fIEMeasurementRequest *pBeaconReq,
 			      tpPESession pSessionEntry)
@@ -528,7 +528,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac,
 	   maxMeasurementDuration = 2^(nonOperatingChanMax - 4) * BeaconInterval
 	 */
 	maxDuration =
-		pMac->rrm.rrmPEContext.rrmEnabledCaps.nonOperatingChanMax - 4;
+		mac->rrm.rrmPEContext.rrmEnabledCaps.nonOperatingChanMax - 4;
 	sign = (maxDuration < 0) ? 1 : 0;
 	maxDuration = (1L << ABS(maxDuration));
 	if (!sign)
@@ -656,10 +656,10 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac,
 	/* Send request to SME. */
 	mmhMsg.type = eWNI_SME_BEACON_REPORT_REQ_IND;
 	mmhMsg.bodyptr = pSmeBcnReportReq;
-	MTRACE(mac_trace(pMac, TRACE_CODE_TX_SME_MSG,
+	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
 			 pSessionEntry->peSessionId, mmhMsg.type));
 	if (QDF_STATUS_SUCCESS !=
-	    lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT))
+	    lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT))
 		return eRRM_FAILURE;
 	return eRRM_SUCCESS;
 }
@@ -688,7 +688,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac,
  *	    in pIes.
  */
 static uint8_t
-rrm_fill_beacon_ies(tpAniSirGlobal pMac,
+rrm_fill_beacon_ies(tpAniSirGlobal mac,
 		    uint8_t *pIes, uint8_t *pNumIes, uint8_t pIesMaxSize,
 		    uint8_t *eids, uint8_t numEids, uint8_t start_offset,
 		    tpSirBssDescription pBssDesc)
@@ -1003,13 +1003,13 @@ end:
 	return status;
 }
 
-static void rrm_process_beacon_request_failure(tpAniSirGlobal pMac,
+static void rrm_process_beacon_request_failure(tpAniSirGlobal mac,
 					       tpPESession pSessionEntry,
 					       tSirMacAddr peer,
 					       tRrmRetStatus status)
 {
 	tpSirMacRadioMeasureReport pReport = NULL;
-	tpRRMReq pCurrentReq = pMac->rrm.rrmPEContext.pCurrentReq;
+	tpRRMReq pCurrentReq = mac->rrm.rrmPEContext.pCurrentReq;
 
 	pReport = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport));
 	if (!pReport)
@@ -1033,7 +1033,7 @@ static void rrm_process_beacon_request_failure(tpAniSirGlobal pMac,
 		return;
 	}
 
-	lim_send_radio_measure_report_action_frame(pMac,
+	lim_send_radio_measure_report_action_frame(mac,
 						   pCurrentReq->dialog_token,
 						   1, true,
 						   pReport, peer,
@@ -1256,10 +1256,10 @@ end:
  * @param startTSF - TSF value at the start of measurement.
  * @return None
  */
-void rrm_update_start_tsf(tpAniSirGlobal pMac, uint32_t startTSF[2])
+void rrm_update_start_tsf(tpAniSirGlobal mac, uint32_t startTSF[2])
 {
-	pMac->rrm.rrmPEContext.startTSF[0] = startTSF[0];
-	pMac->rrm.rrmPEContext.startTSF[1] = startTSF[1];
+	mac->rrm.rrmPEContext.startTSF[0] = startTSF[0];
+	mac->rrm.rrmPEContext.startTSF[1] = startTSF[1];
 }
 
 /* -------------------------------------------------------------------- */
@@ -1277,10 +1277,10 @@ void rrm_update_start_tsf(tpAniSirGlobal pMac, uint32_t startTSF[2])
  * @param startTSF - store star TSF in this buffer.
  * @return txPower
  */
-void rrm_get_start_tsf(tpAniSirGlobal pMac, uint32_t *pStartTSF)
+void rrm_get_start_tsf(tpAniSirGlobal mac, uint32_t *pStartTSF)
 {
-	pStartTSF[0] = pMac->rrm.rrmPEContext.startTSF[0];
-	pStartTSF[1] = pMac->rrm.rrmPEContext.startTSF[1];
+	pStartTSF[0] = mac->rrm.rrmPEContext.startTSF[0];
+	pStartTSF[1] = mac->rrm.rrmPEContext.startTSF[1];
 
 }
 
@@ -1300,9 +1300,9 @@ void rrm_get_start_tsf(tpAniSirGlobal pMac, uint32_t *pStartTSF)
  * @param pSessionEntry
  * @return pointer to tRRMCaps
  */
-tpRRMCaps rrm_get_capabilities(tpAniSirGlobal pMac, tpPESession pSessionEntry)
+tpRRMCaps rrm_get_capabilities(tpAniSirGlobal mac, tpPESession pSessionEntry)
 {
-	return &pMac->rrm.rrmPEContext.rrmEnabledCaps;
+	return &mac->rrm.rrmPEContext.rrmEnabledCaps;
 }
 
 /* -------------------------------------------------------------------- */
@@ -1321,16 +1321,16 @@ tpRRMCaps rrm_get_capabilities(tpAniSirGlobal pMac, tpPESession pSessionEntry)
  * @return None
  */
 
-QDF_STATUS rrm_initialize(tpAniSirGlobal pMac)
+QDF_STATUS rrm_initialize(tpAniSirGlobal mac)
 {
-	tpRRMCaps pRRMCaps = &pMac->rrm.rrmPEContext.rrmEnabledCaps;
+	tpRRMCaps pRRMCaps = &mac->rrm.rrmPEContext.rrmEnabledCaps;
 
-	pMac->rrm.rrmPEContext.pCurrentReq = NULL;
-	pMac->rrm.rrmPEContext.txMgmtPower = 0;
-	pMac->rrm.rrmPEContext.DialogToken = 0;
+	mac->rrm.rrmPEContext.pCurrentReq = NULL;
+	mac->rrm.rrmPEContext.txMgmtPower = 0;
+	mac->rrm.rrmPEContext.DialogToken = 0;
 
-	pMac->rrm.rrmPEContext.rrmEnable = 0;
-	pMac->rrm.rrmPEContext.prev_rrm_report_seq_num = 0xFFFF;
+	mac->rrm.rrmPEContext.rrmEnable = 0;
+	mac->rrm.rrmPEContext.prev_rrm_report_seq_num = 0xFFFF;
 
 	qdf_mem_set(pRRMCaps, sizeof(tRRMCaps), 0);
 	pRRMCaps->LinkMeasurement = 1;
@@ -1366,19 +1366,19 @@ QDF_STATUS rrm_initialize(tpAniSirGlobal pMac)
  * @return None
  */
 
-QDF_STATUS rrm_cleanup(tpAniSirGlobal pMac)
+QDF_STATUS rrm_cleanup(tpAniSirGlobal mac)
 {
-	if (pMac->rrm.rrmPEContext.pCurrentReq) {
-		if (pMac->rrm.rrmPEContext.pCurrentReq->request.Beacon.reqIes.
+	if (mac->rrm.rrmPEContext.pCurrentReq) {
+		if (mac->rrm.rrmPEContext.pCurrentReq->request.Beacon.reqIes.
 		    pElementIds) {
-			qdf_mem_free(pMac->rrm.rrmPEContext.pCurrentReq->
+			qdf_mem_free(mac->rrm.rrmPEContext.pCurrentReq->
 				     request.Beacon.reqIes.pElementIds);
 		}
 
-		qdf_mem_free(pMac->rrm.rrmPEContext.pCurrentReq);
+		qdf_mem_free(mac->rrm.rrmPEContext.pCurrentReq);
 	}
 
-	pMac->rrm.rrmPEContext.pCurrentReq = NULL;
+	mac->rrm.rrmPEContext.pCurrentReq = NULL;
 	return QDF_STATUS_SUCCESS;
 }
 

core/sme/inc/sme_rrm_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -37,16 +37,16 @@
 #include "sme_internal.h"
 #include "sme_rrm_internal.h"
 
-QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
+QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal mac, uint16_t msg_type,
 		void *pMsgBuf);
-QDF_STATUS rrm_close(tpAniSirGlobal pMac);
-QDF_STATUS rrm_open(tpAniSirGlobal pMac);
-QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac,
+QDF_STATUS rrm_close(tpAniSirGlobal mac);
+QDF_STATUS rrm_open(tpAniSirGlobal mac);
+QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal mac,
 		struct rrm_config_param *rrm_config);
-QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac,
+QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal mac,
 		uint8_t sessionId, tpRrmNeighborReq pNeighborReq,
 		tpRrmNeighborRspCallbackInfo callbackInfo);
-QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
+QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal mac,
 		void *pMsgBuf);
 
 /**

core/sme/src/rrm/sme_rrm.c

@@ -66,7 +66,7 @@ uint64_t rrm_scan_timer;
 /**
  * rrm_ll_purge_neighbor_cache() -Purges all the entries in the neighbor cache
  *
- * @pMac: Pointer to the Hal Handle.
+ * @mac: Pointer to the Hal Handle.
  * @pList: Pointer the List that should be purged.
  *
  * This function purges all the entries in the neighbor cache and frees up all
@@ -74,7 +74,7 @@ uint64_t rrm_scan_timer;
  *
  * Return: void
  */
-static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac,
+static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal mac,
 	tDblLinkList *pList)
 {
 	tListElem *pEntry;
@@ -93,7 +93,7 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac,
 /**
  * rrm_indicate_neighbor_report_result() -calls the callback registered for
  *                                                      neighbor report
- * @pMac: Pointer to the Hal Handle.
+ * @mac: Pointer to the Hal Handle.
  * @qdf_status - QDF_STATUS_SUCCESS/QDF_STATUS_FAILURE based on whether a valid
  *                       report is received or neighbor timer expired
  *
@@ -103,41 +103,41 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac,
  *
  * Return: void
  */
-static void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac,
+static void rrm_indicate_neighbor_report_result(tpAniSirGlobal mac,
 						QDF_STATUS qdf_status)
 {
 	NeighborReportRspCallback callback;
 	void *callbackContext;
 
 	/* Reset the neighbor response pending status */
-	pMac->rrm.rrmSmeContext.neighborReqControlInfo.isNeighborRspPending =
+	mac->rrm.rrmSmeContext.neighborReqControlInfo.isNeighborRspPending =
 		false;
 
 	/* Stop the timer if it is already running.
 	 *  The timer should be running only in the SUCCESS case.
 	 */
 	if (QDF_TIMER_STATE_RUNNING ==
-	    qdf_mc_timer_get_current_state(&pMac->rrm.rrmSmeContext.
+	    qdf_mc_timer_get_current_state(&mac->rrm.rrmSmeContext.
 					   neighborReqControlInfo.
 					   neighborRspWaitTimer)) {
 		sme_debug("No entry in neighbor report cache");
-		qdf_mc_timer_stop(&pMac->rrm.rrmSmeContext.
+		qdf_mc_timer_stop(&mac->rrm.rrmSmeContext.
 				  neighborReqControlInfo.neighborRspWaitTimer);
 	}
 	callback =
-		pMac->rrm.rrmSmeContext.neighborReqControlInfo.
+		mac->rrm.rrmSmeContext.neighborReqControlInfo.
 		neighborRspCallbackInfo.neighborRspCallback;
 	callbackContext =
-		pMac->rrm.rrmSmeContext.neighborReqControlInfo.
+		mac->rrm.rrmSmeContext.neighborReqControlInfo.
 		neighborRspCallbackInfo.neighborRspCallbackContext;
 
 	/* Reset the callback and the callback context before calling the
 	 * callback. It is very likely that there may be a registration in
 	 * callback itself.
 	 */
-	pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.
+	mac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.
 	neighborRspCallback = NULL;
-	pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.
+	mac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.
 	neighborRspCallbackContext = NULL;
 
 	/* Call the callback with the status received from caller */
@@ -632,8 +632,8 @@ static QDF_STATUS sme_rrm_scan_request_callback(mac_handle_t mac_handle,
 						eCsrScanStatus status)
 {
 	uint16_t interval;
-	tpAniSirGlobal pMac = MAC_CONTEXT(mac_handle);
-	tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
+	tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext;
 	uint32_t time_tick;
 
 	/* if any more channels are pending, start a timer of a random value
@@ -641,7 +641,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(mac_handle_t mac_handle,
 	 */
 	if ((pSmeRrmContext->currentIndex + 1) <
 	    pSmeRrmContext->channelList.numOfChannels) {
-		sme_rrm_send_scan_result(pMac, 1,
+		sme_rrm_send_scan_result(mac, 1,
 					 &pSmeRrmContext->channelList.
 					 ChannelList[pSmeRrmContext
 					->currentIndex],
@@ -663,7 +663,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(mac_handle_t mac_handle,
 		/* Done with the measurement. Clean up all context and send a
 		 * message to PE with measurement done flag set.
 		 */
-		sme_rrm_send_scan_result(pMac, 1,
+		sme_rrm_send_scan_result(mac, 1,
 					 &pSmeRrmContext->channelList.
 					 ChannelList[pSmeRrmContext
 					->currentIndex],
@@ -910,7 +910,7 @@ free_ch_lst:
 
 /**
  * sme_rrm_process_beacon_report_req_ind() -Process beacon report request
- * @pMac:- Global Mac structure
+ * @mac:- Global Mac structure
  * @pMsgBuf:- a pointer to a buffer that maps to various structures base
  *                  on the message type.The beginning of the buffer can always
  *                  map to tSirSmeRsp.
@@ -920,11 +920,11 @@ free_ch_lst:
  *
  * Return : QDF_STATUS_SUCCESS - Validation is successful.
  */
-QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
+QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal mac,
 						void *pMsgBuf)
 {
 	tpSirBeaconReportReqInd pBeaconReq = (tpSirBeaconReportReqInd) pMsgBuf;
-	tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
+	tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext;
 	uint32_t len = 0, i = 0;
 
 	sme_debug("Received Beacon report request ind Channel = %d",
@@ -943,12 +943,12 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
 	    ((pBeaconReq->channelInfo.channelNum == 255)
 	     && (pBeaconReq->channelList.numChannels == 0))) {
 		/* Add all the channel in the regulatory domain. */
-		wlan_cfg_get_str_len(pMac, WNI_CFG_VALID_CHANNEL_LIST, &len);
+		wlan_cfg_get_str_len(mac, WNI_CFG_VALID_CHANNEL_LIST, &len);
 		pSmeRrmContext->channelList.ChannelList = qdf_mem_malloc(len);
 		if (!pSmeRrmContext->channelList.ChannelList)
 			return QDF_STATUS_E_NOMEM;
 
-		csr_get_cfg_valid_channels(pMac, pSmeRrmContext->channelList.
+		csr_get_cfg_valid_channels(mac, pSmeRrmContext->channelList.
 					ChannelList, &len);
 		pSmeRrmContext->channelList.numOfChannels = (uint8_t) len;
 	} else {
@@ -970,7 +970,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
 
 		if (pBeaconReq->channelInfo.channelNum != 255) {
 			if (csr_roam_is_channel_valid
-				    (pMac, pBeaconReq->channelInfo.channelNum))
+				    (mac, pBeaconReq->channelInfo.channelNum))
 				pSmeRrmContext->channelList.
 				ChannelList[pSmeRrmContext->channelList.
 					    numOfChannels++] =
@@ -981,7 +981,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
 		}
 
 		for (i = 0; i < pBeaconReq->channelList.numChannels; i++) {
-			if (csr_roam_is_channel_valid(pMac, pBeaconReq->
+			if (csr_roam_is_channel_valid(mac, pBeaconReq->
 					channelList.channelNumber[i])) {
 				pSmeRrmContext->channelList.
 					ChannelList[pSmeRrmContext->channelList.
@@ -1022,7 +1022,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
 		pSmeRrmContext->token, pSmeRrmContext->regClass,
 		pSmeRrmContext->randnIntvl, pSmeRrmContext->msgSource);
 
-	return sme_rrm_issue_scan_req(pMac);
+	return sme_rrm_issue_scan_req(mac);
 }
 
 /**
@@ -1035,7 +1035,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
  *
  * Return: QDF_STATUS_SUCCESS - Validation is successful.
  */
-QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t
+QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal mac, uint8_t
 					sessionId, tpRrmNeighborReq
 					pNeighborReq,
 					tpRrmNeighborRspCallbackInfo
@@ -1046,15 +1046,15 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t
 	struct csr_roam_session *pSession;
 
 	sme_debug("Request to send Neighbor report request received ");
-	if (!CSR_IS_SESSION_VALID(pMac, sessionId)) {
+	if (!CSR_IS_SESSION_VALID(mac, sessionId)) {
 		sme_err("Invalid session %d", sessionId);
 		return QDF_STATUS_E_INVAL;
 	}
-	pSession = CSR_GET_SESSION(pMac, sessionId);
+	pSession = CSR_GET_SESSION(mac, sessionId);
 
 	/* If already a report is pending, return failure */
 	if (true ==
-	    pMac->rrm.rrmSmeContext.neighborReqControlInfo.
+	    mac->rrm.rrmSmeContext.neighborReqControlInfo.
 	    isNeighborRspPending) {
 		sme_err("Neighbor request already pending.. Not allowed");
 		return QDF_STATUS_E_AGAIN;
@@ -1064,8 +1064,8 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t
 	if (!pMsg)
 		return QDF_STATUS_E_NOMEM;
 
-	rrm_ll_purge_neighbor_cache(pMac,
-			    &pMac->rrm.rrmSmeContext.neighborReportCache);
+	rrm_ll_purge_neighbor_cache(mac,
+			    &mac->rrm.rrmSmeContext.neighborReportCache);
 
 	pMsg->messageType = eWNI_SME_NEIGHBOR_REPORT_REQ_IND;
 	pMsg->length = sizeof(tSirNeighborReportReqInd);
@@ -1081,16 +1081,16 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t
 	/* Neighbor report request message sent successfully to PE.
 	 * Now register the callbacks
 	 */
-	pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.
+	mac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.
 	neighborRspCallback = callbackInfo->neighborRspCallback;
-	pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.
+	mac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo.
 	neighborRspCallbackContext =
 		callbackInfo->neighborRspCallbackContext;
-	pMac->rrm.rrmSmeContext.neighborReqControlInfo.isNeighborRspPending =
+	mac->rrm.rrmSmeContext.neighborReqControlInfo.isNeighborRspPending =
 		true;
 
 	/* Start neighbor response wait timer now */
-	qdf_mc_timer_start(&pMac->rrm.rrmSmeContext.neighborReqControlInfo.
+	qdf_mc_timer_start(&mac->rrm.rrmSmeContext.neighborReqControlInfo.
 			   neighborRspWaitTimer, callbackInfo->timeout);
 
 	return QDF_STATUS_SUCCESS;
@@ -1192,10 +1192,10 @@ check_11r_assoc:
  *
  * Return: void.
  */
-static void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal pMac,
+static void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal mac,
 				tpRrmNeighborReportDesc pNeighborReportDesc)
 {
-	tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
+	tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext;
 	tListElem *pEntry;
 	tRrmNeighborReportDesc *pTempNeighborReportDesc;
 
@@ -1253,7 +1253,7 @@ static void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal pMac,
 /**
  * sme_rrm_process_neighbor_report() -Process the Neighbor report received
  *                                                     from PE
- * @pMac - Global MAC structure
+ * @mac - Global MAC structure
  * @pMsgBuf - a pointer to a buffer that maps to various structures base
  *                  on the message type.
  *                  The beginning of the buffer can always map to tSirSmeRsp.
@@ -1261,7 +1261,7 @@ static void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal pMac,
  *
  * Return: QDF_STATUS_SUCCESS - Validation is successful
  */
-static QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac,
+static QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal mac,
 						  void *pMsgBuf)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -1273,15 +1273,15 @@ static QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac,
 
 	/* Get the session id */
 	status =
-		csr_roam_get_session_id_from_bssid(pMac,
+		csr_roam_get_session_id_from_bssid(mac,
 			   (struct qdf_mac_addr *) pNeighborRpt->bssId,
 			   &sessionId);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 #ifdef FEATURE_WLAN_ESE
 		/* Clear the cache for ESE. */
-		if (csr_roam_is_ese_assoc(pMac, sessionId)) {
-			rrm_ll_purge_neighbor_cache(pMac,
-						    &pMac->rrm.rrmSmeContext.
+		if (csr_roam_is_ese_assoc(mac, sessionId)) {
+			rrm_ll_purge_neighbor_cache(mac,
+						    &mac->rrm.rrmSmeContext.
 						    neighborReportCache);
 		}
 #endif
@@ -1312,10 +1312,10 @@ static QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac,
 			MAC_ADDR_ARRAY(
 			       pNeighborRpt->sNeighborBssDescription[i].bssId));
 
-		rrm_calculate_neighbor_ap_roam_score(pMac, pNeighborReportDesc);
+		rrm_calculate_neighbor_ap_roam_score(mac, pNeighborReportDesc);
 
 		if (pNeighborReportDesc->roamScore > 0) {
-			rrm_store_neighbor_rpt_by_roam_score(pMac,
+			rrm_store_neighbor_rpt_by_roam_score(mac,
 				     pNeighborReportDesc);
 		} else {
 			sme_err("Roam score of BSSID  " MAC_ADDRESS_STR
@@ -1331,16 +1331,16 @@ static QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac,
 	}
 end:
 
-	if (!csr_ll_count(&pMac->rrm.rrmSmeContext.neighborReportCache))
+	if (!csr_ll_count(&mac->rrm.rrmSmeContext.neighborReportCache))
 		qdf_status = QDF_STATUS_E_FAILURE;
 
-	rrm_indicate_neighbor_report_result(pMac, qdf_status);
+	rrm_indicate_neighbor_report_result(mac, qdf_status);
 	return status;
 }
 
 /**
  * sme_rrm_msg_processor()-Process RRM message
- * @pMac - Pointer to the global MAC parameter structure.
+ * @mac - Pointer to the global MAC parameter structure.
  * @msg_type - the type of msg passed by PE as defined in wni_api.h
  * @pMsgBuf - a pointer to a buffer that maps to various structures base
  *                  on the message type.
@@ -1350,7 +1350,7 @@ end:
  *
  * Return: QDF_STATUS_SUCCESS - Validation is successful.
  */
-QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
+QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal mac, uint16_t msg_type,
 				 void *pMsgBuf)
 {
 	sme_debug("Msg = %d for RRM measurement", msg_type);
@@ -1358,11 +1358,11 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
 	/* switch on the msg type & make the state transition accordingly */
 	switch (msg_type) {
 	case eWNI_SME_NEIGHBOR_REPORT_IND:
-		sme_rrm_process_neighbor_report(pMac, pMsgBuf);
+		sme_rrm_process_neighbor_report(mac, pMsgBuf);
 		break;
 
 	case eWNI_SME_BEACON_REPORT_REQ_IND:
-		sme_rrm_process_beacon_report_req_ind(pMac, pMsgBuf);
+		sme_rrm_process_beacon_report_req_ind(mac, pMsgBuf);
 		break;
 
 	default:
@@ -1375,7 +1375,7 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
 
 /**
  * rrm_iter_meas_timer_handle() - Timer handler to handlet the timeout
- * @ pMac - The handle returned by mac_open.
+ * @ mac - The handle returned by mac_open.
  *
  * Timer handler to handlet the timeout condition when a specific BT
  * stop event does not come back, in which case to restore back the
@@ -1385,15 +1385,15 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
  */
 static void rrm_iter_meas_timer_handle(void *userData)
 {
-	tpAniSirGlobal pMac = (tpAniSirGlobal) userData;
+	tpAniSirGlobal mac = (tpAniSirGlobal) userData;
 
 	sme_warn("Randomization timer expired...send on next channel");
 	/* Issue a scan req for next channel. */
-	sme_rrm_issue_scan_req(pMac);
+	sme_rrm_issue_scan_req(mac);
 }
 /**
  * rrm_neighbor_rsp_timeout_handler() - Timer handler to handlet the timeout
- * @pMac - The handle returned by mac_open.
+ * @mac - The handle returned by mac_open.
  *
  * Timer handler to handle the timeout condition when a neighbor request is sent
  * and no neighbor response is received from the AP
@@ -1402,25 +1402,25 @@ static void rrm_iter_meas_timer_handle(void *userData)
  */
 static void rrm_neighbor_rsp_timeout_handler(void *userData)
 {
-	tpAniSirGlobal pMac = (tpAniSirGlobal) userData;
+	tpAniSirGlobal mac = (tpAniSirGlobal) userData;
 
 	sme_warn("Neighbor Response timed out");
-	rrm_indicate_neighbor_report_result(pMac, QDF_STATUS_E_FAILURE);
+	rrm_indicate_neighbor_report_result(mac, QDF_STATUS_E_FAILURE);
 }
 
 /**
  * rrm_open() - Initialze all RRM module
- * @ pMac: The handle returned by mac_open.
+ * @ mac: The handle returned by mac_open.
  *
  * Initialze all RRM module.
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS rrm_open(tpAniSirGlobal pMac)
+QDF_STATUS rrm_open(tpAniSirGlobal mac)
 {
 
 	QDF_STATUS qdf_status;
-	tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
+	tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext;
 	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 
 	pSmeRrmContext->rrmConfig.max_randn_interval = 50;        /* ms */
@@ -1428,7 +1428,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 	qdf_status = qdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer,
 				       QDF_TIMER_TYPE_SW,
 				       rrm_iter_meas_timer_handle,
-					(void *)pMac);
+					(void *)mac);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		sme_err("Fail to init measurement timer");
@@ -1439,7 +1439,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 		qdf_mc_timer_init(&pSmeRrmContext->neighborReqControlInfo.
 				  neighborRspWaitTimer, QDF_TIMER_TYPE_SW,
 				  rrm_neighbor_rsp_timeout_handler,
-					(void *)pMac);
+					(void *)mac);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		sme_err("Fail to init neighbor rsp wait timer");
@@ -1459,7 +1459,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 
 /**
  * rrm_close() - Release all RRM modules and their resources.
- * @pMac - The handle returned by mac_open.
+ * @mac - The handle returned by mac_open.
  *
  * Release all RRM modules and their resources.
  *
@@ -1468,11 +1468,11 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
  *           QDF_STATUS_SUCCESS  failure
  */
 
-QDF_STATUS rrm_close(tpAniSirGlobal pMac)
+QDF_STATUS rrm_close(tpAniSirGlobal mac)
 {
 
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-	tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
+	tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext;
 
 	if (QDF_TIMER_STATE_RUNNING ==
 	    qdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) {
@@ -1513,7 +1513,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac)
 
 	}
 
-	rrm_ll_purge_neighbor_cache(pMac, &pSmeRrmContext->neighborReportCache);
+	rrm_ll_purge_neighbor_cache(mac, &pSmeRrmContext->neighborReportCache);
 
 	csr_ll_close(&pSmeRrmContext->neighborReportCache);
 
@@ -1523,16 +1523,16 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac)
 
 /**
  * rrm_change_default_config_param() - Changing default config param to new
- * @pMac - The handle returned by mac_open.
+ * @mac - The handle returned by mac_open.
  * param  pRrmConfig - pointer to new rrm configs.
  *
  * Return: QDF_STATUS
  *           QDF_STATUS_SUCCESS  success
  */
-QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac,
+QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal mac,
 					   struct rrm_config_param *rrm_config)
 {
-	qdf_mem_copy(&pMac->rrm.rrmSmeContext.rrmConfig, rrm_config,
+	qdf_mem_copy(&mac->rrm.rrmSmeContext.rrmConfig, rrm_config,
 		     sizeof(struct rrm_config_param));
 
 	return QDF_STATUS_SUCCESS;