diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 0a68205a18..e7fd605e9a 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -2737,7 +2737,7 @@ static inline void hdd_set_tso_flags(struct hdd_context *hdd_ctx,
 #endif /* FEATURE_TSO */
 
 void hdd_get_ibss_peer_info_cb(void *pUserData,
-				tSirPeerInfoRspParams *pPeerInfo);
+				tSirPeerInfoRspParams *peer_info);
 
 #ifdef CONFIG_CNSS_LOGGER
 /**
diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index 09846da0c1..44d5caa182 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -243,7 +243,7 @@ static int hdd_get_tsm_stats(struct hdd_adapter *adapter,
 /**
  * hdd_get_ibss_peer_info_cb() - IBSS peer Info request callback
  * @UserData: Adapter private data
- * @pPeerInfoRsp: Peer info response
+ * @peer_info: Peer info response
  *
  * This is an asynchronous callback function from SME when the peer info
  * is received
@@ -252,7 +252,7 @@ static int hdd_get_tsm_stats(struct hdd_adapter *adapter,
  */
 void
 hdd_get_ibss_peer_info_cb(void *pUserData,
-				tSirPeerInfoRspParams *pPeerInfo)
+			  tSirPeerInfoRspParams *peer_info)
 {
 	struct hdd_adapter *adapter = (struct hdd_adapter *) pUserData;
 	struct hdd_station_ctx *sta_ctx;
@@ -265,24 +265,24 @@ hdd_get_ibss_peer_info_cb(void *pUserData,
 	}
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	if (NULL != pPeerInfo && QDF_STATUS_SUCCESS == pPeerInfo->status) {
+	if (NULL != peer_info && QDF_STATUS_SUCCESS == peer_info->status) {
 		/* validate number of peers */
-		if (pPeerInfo->numPeers > SIR_MAX_NUM_STA_IN_IBSS) {
+		if (peer_info->numPeers > SIR_MAX_NUM_STA_IN_IBSS) {
 			hdd_warn("Limiting num_peers %u to %u",
-				pPeerInfo->numPeers, SIR_MAX_NUM_STA_IN_IBSS);
-			pPeerInfo->numPeers = SIR_MAX_NUM_STA_IN_IBSS;
+				peer_info->numPeers, SIR_MAX_NUM_STA_IN_IBSS);
+			peer_info->numPeers = SIR_MAX_NUM_STA_IN_IBSS;
 		}
-		sta_ctx->ibss_peer_info.status = pPeerInfo->status;
-		sta_ctx->ibss_peer_info.numPeers = pPeerInfo->numPeers;
+		sta_ctx->ibss_peer_info.status = peer_info->status;
+		sta_ctx->ibss_peer_info.numPeers = peer_info->numPeers;
 
-		for (i = 0; i < pPeerInfo->numPeers; i++)
+		for (i = 0; i < peer_info->numPeers; i++)
 			sta_ctx->ibss_peer_info.peerInfoParams[i] =
-				pPeerInfo->peerInfoParams[i];
+				peer_info->peerInfoParams[i];
 	} else {
 		hdd_debug("peerInfo %s: status %u, numPeers %u",
-			pPeerInfo ? "valid" : "null",
-			pPeerInfo ? pPeerInfo->status : QDF_STATUS_E_FAILURE,
-			pPeerInfo ? pPeerInfo->numPeers : 0);
+			peer_info ? "valid" : "null",
+			peer_info ? peer_info->status : QDF_STATUS_E_FAILURE,
+			peer_info ? peer_info->numPeers : 0);
 		sta_ctx->ibss_peer_info.numPeers = 0;
 		sta_ctx->ibss_peer_info.status = QDF_STATUS_E_FAILURE;
 	}
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index f70e548de1..b23ab1a780 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -2164,7 +2164,7 @@
  * @INPUT: None
  *
  * @OUTPUT: print ibss peer in info logs
- *  pPeerInfo->numIBSSPeers = 1
+ *  peer_info->numIBSSPeers = 1
  *  PEER ADDR : 8c:fd:f0:01:9c:bf TxRate: 1 Mbps RSSI: -35
  *
  * This IOCTL is used to rint the ibss peers's MAC, rate and RSSI
@@ -3400,7 +3400,7 @@ static QDF_STATUS hdd_wlan_get_ibss_peer_info(struct hdd_adapter *adapter,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	mac_handle_t mac_handle = adapter->hdd_ctx->mac_handle;
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	tSirPeerInfoRspParams *pPeerInfo = &sta_ctx->ibss_peer_info;
+	tSirPeerInfoRspParams *peer_info = &sta_ctx->ibss_peer_info;
 
 	INIT_COMPLETION(adapter->ibss_peer_info_comp);
 	status = sme_request_ibss_peer_info(mac_handle, adapter,
@@ -3419,16 +3419,16 @@ static QDF_STATUS hdd_wlan_get_ibss_peer_info(struct hdd_adapter *adapter,
 		}
 
 		/** Print the peer info */
-		hdd_debug("pPeerInfo->numIBSSPeers = %d ", pPeerInfo->numPeers);
+		hdd_debug("peer_info->numIBSSPeers = %d ", peer_info->numPeers);
 		{
 			uint8_t mac_addr[QDF_MAC_ADDR_SIZE];
-			uint32_t tx_rate = pPeerInfo->peerInfoParams[0].txRate;
+			uint32_t tx_rate = peer_info->peerInfoParams[0].txRate;
 
-			qdf_mem_copy(mac_addr, pPeerInfo->peerInfoParams[0].
+			qdf_mem_copy(mac_addr, peer_info->peerInfoParams[0].
 					mac_addr, sizeof(mac_addr));
 			hdd_debug("PEER ADDR : %pM TxRate: %d Mbps  RSSI: %d",
 				mac_addr, (int)tx_rate,
-				(int)pPeerInfo->peerInfoParams[0].rssi);
+				(int)peer_info->peerInfoParams[0].rssi);
 		}
 	} else {
 		hdd_warn("Warning: sme_request_ibss_peer_info Request failed");
@@ -3449,7 +3449,7 @@ static QDF_STATUS hdd_wlan_get_ibss_peer_info_all(struct hdd_adapter *adapter)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	mac_handle_t mac_handle = adapter->hdd_ctx->mac_handle;
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	tSirPeerInfoRspParams *pPeerInfo = &sta_ctx->ibss_peer_info;
+	tSirPeerInfoRspParams *peer_info = &sta_ctx->ibss_peer_info;
 	int i;
 
 	INIT_COMPLETION(adapter->ibss_peer_info_comp);
@@ -3469,20 +3469,20 @@ static QDF_STATUS hdd_wlan_get_ibss_peer_info_all(struct hdd_adapter *adapter)
 		}
 
 		/** Print the peer info */
-		hdd_debug("pPeerInfo->numIBSSPeers = %d ",
-			(int)pPeerInfo->numPeers);
-		for (i = 0; i < pPeerInfo->numPeers; i++) {
+		hdd_debug("peer_info->numIBSSPeers = %d ",
+			(int)peer_info->numPeers);
+		for (i = 0; i < peer_info->numPeers; i++) {
 			uint8_t mac_addr[QDF_MAC_ADDR_SIZE];
 			uint32_t tx_rate;
 
-			tx_rate = pPeerInfo->peerInfoParams[i].txRate;
+			tx_rate = peer_info->peerInfoParams[i].txRate;
 			qdf_mem_copy(mac_addr,
-				pPeerInfo->peerInfoParams[i].mac_addr,
+				peer_info->peerInfoParams[i].mac_addr,
 				sizeof(mac_addr));
 
 			hdd_debug(" PEER ADDR : %pM TxRate: %d Mbps RSSI: %d",
 				mac_addr, (int)tx_rate,
-				(int)pPeerInfo->peerInfoParams[i].rssi);
+				(int)peer_info->peerInfoParams[i].rssi);
 		}
 	} else {
 		hdd_warn("Warning: sme_request_ibss_peer_info Request failed");