diff --git a/components/p2p/core/src/wlan_p2p_main.c b/components/p2p/core/src/wlan_p2p_main.c
index ab95df6c2372..968e07e5d7ef 100644
--- a/components/p2p/core/src/wlan_p2p_main.c
+++ b/components/p2p/core/src/wlan_p2p_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020 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
@@ -500,10 +500,9 @@ static QDF_STATUS process_peer_for_noa(struct wlan_objmgr_vdev *vdev,
 	}
 	p2p_vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(vdev,
 						WLAN_UMAC_COMP_P2P);
-	if (!p2p_vdev_obj) {
-		p2p_err("p2p_vdev_obj:%pK", p2p_vdev_obj);
+	if (!p2p_vdev_obj)
 		return QDF_STATUS_E_INVAL;
-	}
+
 	mode = wlan_vdev_mlme_get_opmode(vdev);
 
 	peer_type = wlan_peer_get_peer_type(peer);
@@ -1313,10 +1312,9 @@ void p2p_peer_authorized(struct wlan_objmgr_vdev *vdev, uint8_t *mac_addr)
 	status = process_peer_for_noa(vdev, psoc, peer);
 	wlan_objmgr_peer_release_ref(peer, WLAN_P2P_ID);
 
-	if (status != QDF_STATUS_SUCCESS) {
-		p2p_err("status:%u", status);
+	if (status != QDF_STATUS_SUCCESS)
 		return;
-	}
+
 	p2p_debug("peer is authorized");
 }
 
diff --git a/components/p2p/core/src/wlan_p2p_main.h b/components/p2p/core/src/wlan_p2p_main.h
index 67b292c7242b..eaa277f50ad6 100644
--- a/components/p2p/core/src/wlan_p2p_main.h
+++ b/components/p2p/core/src/wlan_p2p_main.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020 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
@@ -47,6 +47,8 @@
 	QDF_TRACE_ERROR(QDF_MODULE_ID_P2P, params)
 #define p2p_debug_rl(params...) \
 	QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_P2P, params)
+#define p2p_info_rl(params...) \
+		QDF_TRACE_INFO_RL(QDF_MODULE_ID_P2P, params)
 
 #define p2p_alert(params ...) \
 	QDF_TRACE_FATAL(QDF_MODULE_ID_P2P, params)
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 e4ac36e90c32..3e1d01dcd65f 100644
--- a/components/p2p/core/src/wlan_p2p_off_chan_tx.c
+++ b/components/p2p/core/src/wlan_p2p_off_chan_tx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020 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
@@ -787,7 +787,7 @@ static QDF_STATUS p2p_tx_update_connection_status(
 
 	if (tx_frame_info->public_action_type !=
 		P2P_PUBLIC_ACTION_NOT_SUPPORT)
-		p2p_info("%s ---> OTA to " QDF_MAC_ADDR_STR,
+		p2p_debug("%s ---> OTA to " QDF_MAC_ADDR_STR,
 			  p2p_get_frame_type_str(tx_frame_info),
 			  QDF_MAC_ADDR_ARRAY(mac_to));
 
@@ -795,13 +795,13 @@ static QDF_STATUS p2p_tx_update_connection_status(
 	     P2P_PUBLIC_ACTION_PROV_DIS_REQ) &&
 	    (p2p_soc_obj->connection_status == P2P_NOT_ACTIVE)) {
 		p2p_soc_obj->connection_status = P2P_GO_NEG_PROCESS;
-		p2p_info("[P2P State]Inactive state to GO negotiation progress state");
+		p2p_debug("[P2P State]Inactive state to GO negotiation progress state");
 	} else if ((tx_frame_info->public_action_type ==
 		    P2P_PUBLIC_ACTION_NEG_CNF) &&
 		   (p2p_soc_obj->connection_status ==
 		    P2P_GO_NEG_PROCESS)) {
 		p2p_soc_obj->connection_status = P2P_GO_NEG_COMPLETED;
-		p2p_info("[P2P State]GO nego progress to GO nego completed state");
+		p2p_debug("[P2P State]GO nego progress to GO nego completed state");
 	}
 
 	return QDF_STATUS_SUCCESS;
diff --git a/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c b/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c
index 0083c002e88c..7209c0c82a25 100644
--- a/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c
+++ b/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020 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
@@ -199,15 +199,14 @@ QDF_STATUS ucfg_p2p_roc_cancel_req(struct wlan_objmgr_psoc *soc,
 	status = qdf_idr_find(&p2p_soc_obj->p2p_idr,
 			      cookie, &roc_ctx);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		p2p_err("invalid id for cookie 0x%llx", cookie);
+		p2p_debug("invalid id for cookie 0x%llx", cookie);
 		return QDF_STATUS_E_INVAL;
 	}
 
 	cancel_roc = qdf_mem_malloc(sizeof(*cancel_roc));
-	if (!cancel_roc) {
-		p2p_err("failed to allocate cancel p2p roc");
+	if (!cancel_roc)
 		return QDF_STATUS_E_NOMEM;
-	}
+
 
 	cancel_roc->p2p_soc_obj = p2p_soc_obj;
 	cancel_roc->cookie = (uintptr_t)roc_ctx;
@@ -235,7 +234,7 @@ QDF_STATUS ucfg_p2p_cleanup_roc_by_vdev(struct wlan_objmgr_vdev *vdev)
 	p2p_debug("vdev:%pK", vdev);
 
 	if (!vdev) {
-		p2p_err("null vdev");
+		p2p_debug("null vdev");
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -279,7 +278,7 @@ QDF_STATUS ucfg_p2p_cleanup_tx_by_vdev(struct wlan_objmgr_vdev *vdev)
 	struct wlan_objmgr_psoc *psoc;
 
 	if (!vdev) {
-		p2p_err("null vdev");
+		p2p_debug("null vdev");
 		return QDF_STATUS_E_INVAL;
 	}