diff --git a/components/p2p/core/src/wlan_p2p_off_chan_tx.c b/components/p2p/core/src/wlan_p2p_off_chan_tx.c
index 4edea17ae0..4a8e8b09e0 100644
--- a/components/p2p/core/src/wlan_p2p_off_chan_tx.c
+++ b/components/p2p/core/src/wlan_p2p_off_chan_tx.c
@@ -1200,8 +1200,6 @@ static QDF_STATUS p2p_move_tx_context_to_ack_queue(
 	struct tx_action_context *cur_tx_ctx;
 	QDF_STATUS status;
 
-	p2p_debug("move tx context to wait for roc queue, %pK", tx_ctx);
-
 	cur_tx_ctx = p2p_find_tx_ctx(p2p_soc_obj, (uintptr_t)tx_ctx,
 					&is_roc_q, &is_ack_q);
 	if (cur_tx_ctx) {
@@ -1225,8 +1223,6 @@ static QDF_STATUS p2p_move_tx_context_to_ack_queue(
 				&tx_ctx->node);
 	if (status != QDF_STATUS_SUCCESS)
 		p2p_err("Failed to insert off chan tx context to wait ack req queue");
-	p2p_debug("insert tx context to wait for ack queue, status:%d",
-		status);
 
 	return status;
 }
@@ -1419,20 +1415,18 @@ static QDF_STATUS p2p_enable_tx_timer(struct tx_action_context *tx_ctx)
 {
 	QDF_STATUS status;
 
-	p2p_debug("tx context:%pK", tx_ctx);
-
 	status = qdf_mc_timer_init(&tx_ctx->tx_timer,
 				   QDF_TIMER_TYPE_SW, p2p_tx_timeout,
 				   tx_ctx->p2p_soc_obj);
 	if (status != QDF_STATUS_SUCCESS) {
-		p2p_err("failed to init tx timer");
+		p2p_err("failed to init tx timer tx_ctx:%pK", tx_ctx);
 		return status;
 	}
 
 	status = qdf_mc_timer_start(&tx_ctx->tx_timer,
 				    P2P_ACTION_FRAME_TX_TIMEOUT);
 	if (status != QDF_STATUS_SUCCESS)
-		p2p_err("tx timer start failed");
+		p2p_err("tx timer start failed tx_ctx:%pK", tx_ctx);
 
 	return status;
 }
@@ -2920,8 +2914,6 @@ QDF_STATUS p2p_process_mgmt_tx_cancel(
 		return QDF_STATUS_SUCCESS;
 	}
 
-	p2p_debug("cookie:0x%llx", cancel_tx->cookie);
-
 	cur_tx_ctx = p2p_find_tx_ctx(cancel_tx->p2p_soc_obj,
 			cancel_tx->cookie, &is_roc_q, &is_ack_q);
 	if (cur_tx_ctx) {
diff --git a/components/p2p/core/src/wlan_p2p_roc.c b/components/p2p/core/src/wlan_p2p_roc.c
index 3d3b4a2b74..3435780a2c 100644
--- a/components/p2p/core/src/wlan_p2p_roc.c
+++ b/components/p2p/core/src/wlan_p2p_roc.c
@@ -295,11 +295,7 @@ static QDF_STATUS p2p_execute_cancel_roc_req(
 	QDF_STATUS status;
 	struct p2p_soc_priv_obj *p2p_soc_obj = roc_ctx->p2p_soc_obj;
 
-	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, tx ctx:%pK, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
-		p2p_soc_obj, roc_ctx, roc_ctx->vdev_id,
-		roc_ctx->scan_id, roc_ctx->tx_ctx, roc_ctx->chan,
-		roc_ctx->phy_mode, roc_ctx->duration,
-		roc_ctx->roc_type, roc_ctx->roc_state);
+	p2p_debug("p2p execute cancel roc req");
 
 	roc_ctx->roc_state = ROC_STATE_CANCEL_IN_PROG;
 	qdf_event_reset(&p2p_soc_obj->cancel_roc_done);
@@ -523,11 +519,7 @@ static QDF_STATUS p2p_process_scan_complete_evt(
 	uint32_t size;
 	struct p2p_soc_priv_obj *p2p_soc_obj = roc_ctx->p2p_soc_obj;
 
-	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, tx ctx:%pK, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
-		p2p_soc_obj, roc_ctx, roc_ctx->vdev_id,
-		roc_ctx->scan_id, roc_ctx->tx_ctx, roc_ctx->chan,
-		roc_ctx->phy_mode, roc_ctx->duration,
-		roc_ctx->roc_type, roc_ctx->roc_state);
+	p2p_debug("vdev_id:%d scan_id:%d", roc_ctx->vdev_id, roc_ctx->scan_id);
 
 	/* allow runtime suspend */
 	qdf_runtime_pm_allow_suspend(&p2p_soc_obj->roc_runtime_lock);
@@ -554,7 +546,7 @@ static QDF_STATUS p2p_process_scan_complete_evt(
 	qdf_event_set(&p2p_soc_obj->cancel_roc_done);
 
 	size = qdf_list_size(&p2p_soc_obj->roc_q);
-	p2p_debug("P2P roc queue size is %d", status);
+
 	if (size > 0) {
 		status = qdf_list_peek_front(&p2p_soc_obj->roc_q,
 				&next_node);
@@ -870,15 +862,16 @@ QDF_STATUS p2p_process_cancel_roc_req(
 	curr_roc_ctx = p2p_find_roc_ctx(p2p_soc_obj,
 				cancel_roc_ctx->cookie);
 
-	p2p_debug("p2p soc obj:%pK, cookie:%llx, roc ctx:%pK",
-		p2p_soc_obj, cancel_roc_ctx->cookie, curr_roc_ctx);
-
 	if (!curr_roc_ctx) {
 		p2p_debug("Failed to find roc req by cookie, cookie %llx",
 				cancel_roc_ctx->cookie);
 		return QDF_STATUS_E_INVAL;
 	}
 
+	p2p_debug("roc ctx:%pK vdev_id:%d, scan_id:%d, roc_type:%d, roc_state:%d",
+		curr_roc_ctx, curr_roc_ctx->vdev_id, curr_roc_ctx->scan_id,
+		curr_roc_ctx->roc_type, curr_roc_ctx->roc_state);
+
 	if (curr_roc_ctx->roc_state == ROC_STATE_IDLE) {
 		status = p2p_destroy_roc_ctx(curr_roc_ctx, true, true);
 	} else if (curr_roc_ctx->roc_state ==
diff --git a/os_if/p2p/src/wlan_cfg80211_p2p.c b/os_if/p2p/src/wlan_cfg80211_p2p.c
index 15ee29fd6f..ddeba7bf0d 100644
--- a/os_if/p2p/src/wlan_cfg80211_p2p.c
+++ b/os_if/p2p/src/wlan_cfg80211_p2p.c
@@ -54,10 +54,6 @@ static void wlan_p2p_rx_callback(void *user_data,
 	struct vdev_osif_priv *osif_priv;
 	struct wireless_dev *wdev;
 
-	osif_debug("user data:%pK, vdev id:%d, rssi:%d, buf:%pK, len:%d",
-		   user_data, rx_frame->vdev_id, rx_frame->rx_rssi,
-		   rx_frame->buf, rx_frame->frame_len);
-
 	psoc = user_data;
 	if (!psoc) {
 		osif_err("psoc is null");