Browse Source

qcacmn: umac: Replace instances of unadorned %p

Replace instances of unadorned %p in umac.

Change-Id: I7ae33c51405b31df24670dee3c98b6b4f1da9ab4
CRs-Fixed: 2111274
Jeff Johnson 7 years ago
parent
commit
dc3f822c6e

+ 10 - 10
core/src/wlan_p2p_main.c

@@ -123,7 +123,7 @@ static QDF_STATUS p2p_psoc_obj_create_notification(
 		return status;
 	}
 
-	p2p_debug("p2p soc object create successful, %p", p2p_soc_obj);
+	p2p_debug("p2p soc object create successful, %pK", p2p_soc_obj);
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -165,7 +165,7 @@ static QDF_STATUS p2p_psoc_obj_destroy_notification(
 		return status;
 	}
 
-	p2p_debug("destroy p2p soc object, %p", p2p_soc_obj);
+	p2p_debug("destroy p2p soc object, %pK", p2p_soc_obj);
 
 	qdf_mem_free(p2p_soc_obj);
 
@@ -222,7 +222,7 @@ static QDF_STATUS p2p_vdev_obj_create_notification(
 		return status;
 	}
 
-	p2p_debug("p2p vdev object create successful, %p", p2p_vdev_obj);
+	p2p_debug("p2p vdev object create successful, %pK", p2p_vdev_obj);
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -272,7 +272,7 @@ static QDF_STATUS p2p_vdev_obj_destroy_notification(
 		return status;
 	}
 
-	p2p_debug("destroy p2p vdev object, p2p vdev obj:%p, noa info:%p",
+	p2p_debug("destroy p2p vdev object, p2p vdev obj:%pK, noa info:%pK",
 		p2p_vdev_obj, p2p_vdev_obj->noa_info);
 
 	if (p2p_vdev_obj->noa_info)
@@ -354,7 +354,7 @@ static QDF_STATUS p2p_peer_obj_destroy_notification(
 						WLAN_UMAC_COMP_P2P);
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!p2p_vdev_obj || !psoc) {
-		p2p_err("p2p_vdev_obj:%p psoc:%p", p2p_vdev_obj, psoc);
+		p2p_err("p2p_vdev_obj:%pK psoc:%pK", p2p_vdev_obj, psoc);
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -473,13 +473,13 @@ static QDF_STATUS process_peer_for_noa(struct wlan_objmgr_vdev *vdev,
 	uint8_t vdev_id;
 
 	if (!vdev || !psoc || !peer) {
-		p2p_err("vdev:%p psoc:%p peer:%p", vdev, psoc, peer);
+		p2p_err("vdev:%pK psoc:%pK peer:%pK", vdev, psoc, peer);
 		return QDF_STATUS_E_INVAL;
 	}
 	p2p_vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(vdev,
 						WLAN_UMAC_COMP_P2P);
 	if (!p2p_vdev_obj) {
-		p2p_err("p2p_vdev_obj:%p", p2p_vdev_obj);
+		p2p_err("p2p_vdev_obj:%pK", p2p_vdev_obj);
 		return QDF_STATUS_E_INVAL;
 	}
 	mode = wlan_vdev_mlme_get_opmode(vdev);
@@ -948,7 +948,7 @@ QDF_STATUS p2p_process_noa(struct p2p_noa_event *noa_event)
 	p2p_soc_obj = noa_event->p2p_soc_obj;
 	psoc = p2p_soc_obj->soc;
 
-	p2p_debug("psoc:%p, index:%d, opps_ps:%d, ct_window:%d, num_desc:%d, vdev_id:%d",
+	p2p_debug("psoc:%pK, index:%d, opps_ps:%d, ct_window:%d, num_desc:%d, vdev_id:%d",
 		psoc, noa_info->index, noa_info->opps_ps,
 		noa_info->ct_window, noa_info->num_desc,
 		noa_info->vdev_id);
@@ -999,12 +999,12 @@ void p2p_peer_authorized(struct wlan_objmgr_vdev *vdev, uint8_t *mac_addr)
 	struct wlan_objmgr_peer *peer;
 
 	if (!vdev) {
-		p2p_err("vdev:%p", vdev);
+		p2p_err("vdev:%pK", vdev);
 		return;
 	}
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
-		p2p_err("psoc:%p", psoc);
+		p2p_err("psoc:%pK", psoc);
 		return;
 	}
 	peer = wlan_objmgr_get_peer(psoc, mac_addr, WLAN_P2P_ID);

+ 19 - 19
core/src/wlan_p2p_off_chan_tx.c

@@ -183,7 +183,7 @@ static const uint8_t *p2p_get_presence_noa_attr(const uint8_t *pies, int length)
 	uint8_t elem_id;
 	uint16_t elem_len;
 
-	p2p_debug("pies:%p, length:%d", pies, length);
+	p2p_debug("pies:%pK, length:%d", pies, length);
 
 	while (left >= 3) {
 		elem_id = ptr[0];
@@ -221,7 +221,7 @@ static uint8_t p2p_get_noa_attr_stream_in_mult_p2p_ies(uint8_t *noa_stream,
 {
 	uint8_t overflow_p2p_stream[P2P_MAX_NOA_ATTR_LEN];
 
-	p2p_debug("noa_stream:%p, noa_len:%d, overflow_len:%d",
+	p2p_debug("noa_stream:%pK, noa_len:%d, overflow_len:%d",
 		noa_stream, noa_len, overflow_len);
 	if ((noa_len <= (P2P_MAX_NOA_ATTR_LEN + P2P_IE_HEADER_LEN)) &&
 	    (noa_len >= overflow_len) &&
@@ -424,7 +424,7 @@ static uint16_t p2p_update_noa_stream(struct tx_action_context *tx_ctx,
 	*total_len = buf_len;
 	nbytes_copy = (p2p_ie + orig_len + 2) - tx_ctx->buf;
 
-	p2p_debug("noa_len=%d orig_len=%d p2p_ie=%p buf_len=%d nbytes copy=%d ",
+	p2p_debug("noa_len=%d orig_len=%d p2p_ie=%pK buf_len=%d nbytes copy=%d ",
 		noa_len, orig_len, p2p_ie, buf_len, nbytes_copy);
 
 	return noa_len;
@@ -737,7 +737,7 @@ static QDF_STATUS p2p_send_tx_conf(struct tx_action_context *tx_ctx,
 	tx_cnf.buf_len = tx_ctx->buf_len;
 	tx_cnf.status = status ? 0 : 1;
 
-	p2p_debug("soc:%p, vdev_id:%d, action_cookie:%llx, len:%d, status:%d, buf:%p",
+	p2p_debug("soc:%pK, vdev_id:%d, action_cookie:%llx, len:%d, status:%d, buf:%pK",
 		p2p_soc_obj->soc, tx_cnf.vdev_id,
 		tx_cnf.action_cookie, tx_cnf.buf_len,
 		tx_cnf.status, tx_cnf.buf);
@@ -850,7 +850,7 @@ static QDF_STATUS p2p_roc_req_for_tx_action(
 	roc_ctx->roc_type = OFF_CHANNEL_TX;
 	tx_ctx->roc_cookie = (uintptr_t)roc_ctx;
 
-	p2p_debug("create roc request for off channel tx, tx ctx:%p, roc ctx:%p",
+	p2p_debug("create roc request for off channel tx, tx ctx:%pK, roc ctx:%pK",
 		tx_ctx, roc_ctx);
 
 	status = p2p_process_roc_req(roc_ctx);
@@ -887,7 +887,7 @@ static struct tx_action_context *p2p_find_tx_ctx(
 	*is_roc_q = false;
 	*is_ack_q = false;
 
-	p2p_debug("Start to find tx ctx, p2p soc_obj:%p, cookie:%llx",
+	p2p_debug("Start to find tx ctx, p2p soc_obj:%pK, cookie:%llx",
 		p2p_soc_obj, cookie);
 
 	list_for_each_safe(pos, tmp, &p2p_soc_obj->tx_q_roc.anchor) {
@@ -933,7 +933,7 @@ static struct tx_action_context *p2p_find_tx_ctx_by_roc(
 	*is_roc_q = false;
 	*is_ack_q = false;
 
-	p2p_debug("Start to find tx ctx, p2p soc_obj:%p, cookie:%llx",
+	p2p_debug("Start to find tx ctx, p2p soc_obj:%pK, cookie:%llx",
 		p2p_soc_obj, cookie);
 
 	list_for_each_safe(pos, tmp, &p2p_soc_obj->tx_q_roc.anchor) {
@@ -976,7 +976,7 @@ 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, %p", tx_ctx);
+	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);
@@ -1104,7 +1104,7 @@ static QDF_STATUS p2p_remove_tx_context(
 	struct p2p_soc_priv_obj *p2p_soc_obj = tx_ctx->p2p_soc_obj;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
-	p2p_debug("tx context:%p", tx_ctx);
+	p2p_debug("tx context:%pK", tx_ctx);
 
 	cur_tx_ctx = p2p_find_tx_ctx(p2p_soc_obj, cookie, &is_roc_q,
 					&is_ack_q);
@@ -1147,7 +1147,7 @@ static void p2p_tx_timeout(void *pdata)
 {
 	struct tx_action_context *tx_ctx = pdata;
 
-	p2p_debug("pdata:%p", pdata);
+	p2p_debug("pdata:%pK", pdata);
 
 	if (!tx_ctx) {
 		p2p_err("invalid tx context");
@@ -1171,7 +1171,7 @@ static QDF_STATUS p2p_enable_tx_timer(struct tx_action_context *tx_ctx)
 {
 	QDF_STATUS status;
 
-	p2p_debug("tx context:%p", tx_ctx);
+	p2p_debug("tx context:%pK", tx_ctx);
 
 	status = qdf_mc_timer_init(&tx_ctx->tx_timer,
 			QDF_TIMER_TYPE_SW, p2p_tx_timeout,
@@ -1201,7 +1201,7 @@ static QDF_STATUS p2p_disable_tx_timer(struct tx_action_context *tx_ctx)
 {
 	QDF_STATUS status;
 
-	p2p_debug("tx context:%p", tx_ctx);
+	p2p_debug("tx context:%pK", tx_ctx);
 
 	status = qdf_mc_timer_stop(&tx_ctx->tx_timer);
 	if (status != QDF_STATUS_SUCCESS)
@@ -1324,12 +1324,12 @@ void p2p_dump_tx_queue(struct p2p_soc_priv_obj *p2p_soc_obj)
 	struct tx_action_context *tx_ctx;
 	qdf_list_node_t *tmp, *pos;
 
-	p2p_debug("dump tx queue wait for roc, p2p soc obj:%p, size:%d",
+	p2p_debug("dump tx queue wait for roc, p2p soc obj:%pK, size:%d",
 		p2p_soc_obj, qdf_list_size(&p2p_soc_obj->tx_q_roc));
 	list_for_each_safe(pos, tmp, &p2p_soc_obj->tx_q_roc.anchor) {
 		tx_ctx = list_entry(pos, struct tx_action_context,
 				node);
-		p2p_debug("p2p soc object:%p, tx ctx:%p, vdev_id:%d, scan_id:%d, roc_cookie:%llx, chan:%d, buf:%p, len:%d, off_chan:%d, cck:%d, ack:%d, duration:%d",
+		p2p_debug("p2p soc object:%pK, tx ctx:%pK, vdev_id:%d, scan_id:%d, roc_cookie:%llx, chan:%d, buf:%pK, len:%d, off_chan:%d, cck:%d, ack:%d, duration:%d",
 			p2p_soc_obj, tx_ctx,
 			tx_ctx->vdev_id, tx_ctx->scan_id,
 			tx_ctx->roc_cookie, tx_ctx->chan,
@@ -1343,7 +1343,7 @@ void p2p_dump_tx_queue(struct p2p_soc_priv_obj *p2p_soc_obj)
 	list_for_each_safe(pos, tmp, &p2p_soc_obj->tx_q_ack.anchor) {
 		tx_ctx = list_entry(pos, struct tx_action_context,
 				node);
-		p2p_debug("p2p soc object:%p, tx_ctx:%p, vdev_id:%d, scan_id:%d, roc_cookie:%llx, chan:%d, buf:%p, len:%d, off_chan:%d, cck:%d, ack:%d, duration:%d",
+		p2p_debug("p2p soc object:%pK, tx_ctx:%pK, vdev_id:%d, scan_id:%d, roc_cookie:%llx, chan:%d, buf:%pK, len:%d, off_chan:%d, cck:%d, ack:%d, duration:%d",
 			p2p_soc_obj, tx_ctx,
 			tx_ctx->vdev_id, tx_ctx->scan_id,
 			tx_ctx->roc_cookie, tx_ctx->chan,
@@ -1363,7 +1363,7 @@ QDF_STATUS p2p_ready_to_tx_frame(struct p2p_soc_priv_obj *p2p_soc_obj,
 
 	cur_tx_ctx = p2p_find_tx_ctx_by_roc(p2p_soc_obj, cookie,
 					&is_roc_q, &is_ack_q);
-	p2p_debug("tx_ctx:%p, is_roc_q:%d, is_ack_q:%d", cur_tx_ctx,
+	p2p_debug("tx_ctx:%pK, is_roc_q:%d, is_ack_q:%d", cur_tx_ctx,
 		is_roc_q, is_ack_q);
 	if (cur_tx_ctx) {
 		if (is_roc_q) {
@@ -1445,7 +1445,7 @@ QDF_STATUS p2p_process_mgmt_tx(struct tx_action_context *tx_ctx)
 
 	p2p_soc_obj = tx_ctx->p2p_soc_obj;
 
-	p2p_debug("soc:%p, tx_ctx:%p, vdev_id:%d, scan_id:%d, roc_cookie:%llx, chan:%d, buf:%p, len:%d, off_chan:%d, cck:%d, ack:%d, duration:%d",
+	p2p_debug("soc:%pK, tx_ctx:%pK, vdev_id:%d, scan_id:%d, roc_cookie:%llx, chan:%d, buf:%pK, len:%d, off_chan:%d, cck:%d, ack:%d, duration:%d",
 		p2p_soc_obj->soc, tx_ctx, tx_ctx->vdev_id,
 		tx_ctx->scan_id, tx_ctx->roc_cookie, tx_ctx->chan,
 		tx_ctx->buf, tx_ctx->buf_len, tx_ctx->off_chan,
@@ -1568,7 +1568,7 @@ QDF_STATUS p2p_process_mgmt_tx_ack_cnf(
 		return QDF_STATUS_E_INVAL;
 	}
 
-	p2p_debug("soc:%p, vdev_id:%d, action_cookie:%llx, len:%d, status:%d, buf:%p",
+	p2p_debug("soc:%pK, vdev_id:%d, action_cookie:%llx, len:%d, status:%d, buf:%pK",
 		p2p_soc_obj->soc, tx_cnf->vdev_id,
 		tx_cnf->action_cookie, tx_cnf->buf_len,
 		tx_cnf->status, tx_cnf->buf);
@@ -1606,7 +1606,7 @@ QDF_STATUS p2p_process_rx_mgmt(
 		return QDF_STATUS_E_INVAL;
 	}
 
-	p2p_debug("soc:%p, frame_len:%d, rx_chan:%d, vdev_id:%d, frm_type:%d, rx_rssi:%d, buf:%p",
+	p2p_debug("soc:%pK, frame_len:%d, rx_chan:%d, vdev_id:%d, frm_type:%d, rx_rssi:%d, buf:%pK",
 		p2p_soc_obj->soc, rx_mgmt->frame_len,
 		rx_mgmt->rx_chan, rx_mgmt->vdev_id, rx_mgmt->frm_type,
 		rx_mgmt->rx_rssi, rx_mgmt->buf);

+ 21 - 21
core/src/wlan_p2p_roc.c

@@ -52,7 +52,7 @@ static QDF_STATUS p2p_mgmt_rx_ops(struct wlan_objmgr_psoc *psoc,
 	struct mgmt_txrx_mgmt_frame_cb_info frm_cb_info;
 	QDF_STATUS status;
 
-	p2p_debug("psoc:%p, is register rx:%d", psoc, isregister);
+	p2p_debug("psoc:%pK, is register rx:%d", psoc, isregister);
 
 	frm_cb_info.frm_type = MGMT_PROBE_REQ;
 	frm_cb_info.mgmt_rx_cb = tgt_p2p_mgmt_frame_rx_cb;
@@ -184,7 +184,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:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, 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->cookie, roc_ctx->chan,
 		roc_ctx->phy_mode, roc_ctx->duration,
@@ -194,7 +194,7 @@ static QDF_STATUS p2p_execute_cancel_roc_req(
 	qdf_event_reset(&p2p_soc_obj->cancel_roc_done);
 	status = qdf_mc_timer_stop(&roc_ctx->roc_timer);
 	if (status != QDF_STATUS_SUCCESS)
-		p2p_err("Failed to stop roc timer, roc %p", roc_ctx);
+		p2p_err("Failed to stop roc timer, roc %pK", roc_ctx);
 
 	status = p2p_scan_abort(roc_ctx);
 	if (status != QDF_STATUS_SUCCESS) {
@@ -217,7 +217,7 @@ static void p2p_roc_timeout(void *pdata)
 	struct p2p_roc_context *roc_ctx;
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 
-	p2p_debug("p2p soc obj:%p", pdata);
+	p2p_debug("p2p soc obj:%pK", pdata);
 
 	p2p_soc_obj = pdata;
 	if (!p2p_soc_obj) {
@@ -231,7 +231,7 @@ static void p2p_roc_timeout(void *pdata)
 		return;
 	}
 
-	p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
 		roc_ctx->p2p_soc_obj, roc_ctx, roc_ctx->vdev_id,
 		roc_ctx->scan_id, roc_ctx->cookie, roc_ctx->chan,
 		roc_ctx->phy_mode, roc_ctx->duration,
@@ -277,7 +277,7 @@ static QDF_STATUS p2p_send_roc_event(
 	p2p_evt.chan = roc_ctx->chan;
 	p2p_evt.duration = roc_ctx->duration;
 
-	p2p_debug("p2p soc_obj:%p, roc_ctx:%p, vdev_id:%d, roc_event:"
+	p2p_debug("p2p soc_obj:%pK, roc_ctx:%pK, vdev_id:%d, roc_event:"
 		"%d, cookie:%llx, chan:%d, duration:%d", p2p_soc_obj,
 		roc_ctx, p2p_evt.vdev_id, p2p_evt.roc_event,
 		p2p_evt.cookie, p2p_evt.chan, p2p_evt.duration);
@@ -303,7 +303,7 @@ static QDF_STATUS p2p_destroy_roc_ctx(struct p2p_roc_context *roc_ctx,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct p2p_soc_priv_obj *p2p_soc_obj = roc_ctx->p2p_soc_obj;
 
-	p2p_debug("p2p_soc_obj:%p, roc_ctx:%p, up_layer_event:%d, in_roc_queue:%d",
+	p2p_debug("p2p_soc_obj:%pK, roc_ctx:%pK, up_layer_event:%d, in_roc_queue:%d",
 		p2p_soc_obj, roc_ctx, up_layer_event, in_roc_queue);
 
 	if (up_layer_event) {
@@ -338,7 +338,7 @@ static QDF_STATUS p2p_execute_roc_req(struct p2p_roc_context *roc_ctx)
 	uint32_t go_num;
 	struct p2p_soc_priv_obj *p2p_soc_obj = roc_ctx->p2p_soc_obj;
 
-	p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, 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->cookie, roc_ctx->chan,
 		roc_ctx->phy_mode, roc_ctx->duration,
@@ -404,7 +404,7 @@ static struct p2p_roc_context *p2p_find_roc_ctx(
 	struct p2p_roc_context *curr_roc_ctx;
 	qdf_list_node_t *tmp, *pos;
 
-	p2p_debug("p2p soc obj:%p, cookie:%llx", p2p_soc_obj, cookie);
+	p2p_debug("p2p soc obj:%pK, cookie:%llx", p2p_soc_obj, cookie);
 
 	list_for_each_safe(pos, tmp, &p2p_soc_obj->roc_q.anchor) {
 		curr_roc_ctx = list_entry(pos, struct p2p_roc_context,
@@ -428,7 +428,7 @@ static QDF_STATUS p2p_process_scan_start_evt(
 	struct p2p_roc_context *roc_ctx)
 {
 	roc_ctx->roc_state = ROC_STATE_STARTED;
-	p2p_debug("scan started, roc ctx:%p, scan id:%d",
+	p2p_debug("scan started, roc ctx:%pK, scan id:%d",
 		roc_ctx, roc_ctx->scan_id);
 
 	return QDF_STATUS_SUCCESS;
@@ -454,7 +454,7 @@ static QDF_STATUS p2p_process_ready_on_channel_evt(
 	p2p_soc_obj = roc_ctx->p2p_soc_obj;
 	roc_ctx->roc_state = ROC_STATE_ON_CHAN;
 
-	p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, 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->cookie, roc_ctx->chan,
 		roc_ctx->phy_mode, roc_ctx->duration,
@@ -494,7 +494,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:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, 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->cookie, roc_ctx->chan,
 		roc_ctx->phy_mode, roc_ctx->duration,
@@ -548,7 +548,7 @@ QDF_STATUS p2p_mgmt_rx_action_ops(struct wlan_objmgr_psoc *psoc,
 	struct mgmt_txrx_mgmt_frame_cb_info frm_cb_info[2];
 	QDF_STATUS status;
 
-	p2p_debug("psoc:%p, is register rx:%d", psoc, isregister);
+	p2p_debug("psoc:%pK, is register rx:%d", psoc, isregister);
 
 	frm_cb_info[0].frm_type = MGMT_ACTION_VENDOR_SPECIFIC;
 	frm_cb_info[0].mgmt_rx_cb = tgt_p2p_mgmt_frame_rx_cb;
@@ -575,7 +575,7 @@ struct p2p_roc_context *p2p_find_current_roc_ctx(
 		roc_ctx = list_entry(pos, struct p2p_roc_context,
 					node);
 		if (roc_ctx->roc_state != ROC_STATE_IDLE) {
-			p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id"
+			p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id"
 				":%d, scan_id:%d, cookie:%llx, chan:"
 				"%d, phy_mode:%d, duration:%d, "
 				"roc_type:%d, roc_state:%d",
@@ -626,7 +626,7 @@ QDF_STATUS p2p_cleanup_roc_queue(struct p2p_soc_priv_obj *p2p_soc_obj)
 		roc_ctx = list_entry(pos, struct p2p_roc_context,
 					node);
 
-		p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+		p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
 			roc_ctx->p2p_soc_obj, roc_ctx,
 			roc_ctx->vdev_id, roc_ctx->scan_id,
 			roc_ctx->cookie, roc_ctx->chan,
@@ -651,7 +651,7 @@ QDF_STATUS p2p_cleanup_roc_queue(struct p2p_soc_priv_obj *p2p_soc_obj)
 		roc_ctx = list_entry(pos, struct p2p_roc_context,
 					node);
 
-	p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
 		roc_ctx->p2p_soc_obj, roc_ctx, roc_ctx->vdev_id,
 		roc_ctx->scan_id, roc_ctx->cookie, roc_ctx->chan,
 		roc_ctx->phy_mode, roc_ctx->duration,
@@ -685,7 +685,7 @@ QDF_STATUS p2p_cleanup_roc_by_vdev(
 		roc_ctx = list_entry(pos, struct p2p_roc_context,
 					node);
 
-		p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+		p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
 			roc_ctx->p2p_soc_obj, roc_ctx,
 			roc_ctx->vdev_id, roc_ctx->scan_id,
 			roc_ctx->cookie, roc_ctx->chan,
@@ -710,7 +710,7 @@ QDF_STATUS p2p_cleanup_roc_by_vdev(
 		roc_ctx = list_entry(pos, struct p2p_roc_context,
 					node);
 
-	p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
 		roc_ctx->p2p_soc_obj, roc_ctx, roc_ctx->vdev_id,
 		roc_ctx->scan_id, roc_ctx->cookie, roc_ctx->chan,
 		roc_ctx->phy_mode, roc_ctx->duration,
@@ -741,7 +741,7 @@ QDF_STATUS p2p_process_roc_req(struct p2p_roc_context *roc_ctx)
 
 	p2p_soc_obj = roc_ctx->p2p_soc_obj;
 
-	p2p_debug("p2p soc obj:%p, roc ctx:%p, vdev_id:%d, scan_id:%d, cookie:%llx, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d",
+	p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, cookie:%llx, 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->cookie, roc_ctx->chan,
 		roc_ctx->phy_mode, roc_ctx->duration,
@@ -777,7 +777,7 @@ 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:%p, cookie:%llx, roc ctx:%p",
+	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) {
@@ -811,7 +811,7 @@ void p2p_scan_event_cb(struct wlan_objmgr_vdev *vdev,
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct p2p_roc_context *curr_roc_ctx;
 
-	p2p_debug("soc:%p, scan event:%d", arg, event->type);
+	p2p_debug("soc:%pK, scan event:%d", arg, event->type);
 
 	p2p_soc_obj = (struct p2p_soc_priv_obj *)arg;
 	if (!p2p_soc_obj) {

+ 5 - 5
dispatcher/src/wlan_p2p_tgt_api.c

@@ -112,7 +112,7 @@ void tgt_p2p_scan_event_cb(struct wlan_objmgr_vdev *vdev,
 QDF_STATUS tgt_p2p_mgmt_download_comp_cb(void *context,
 	qdf_nbuf_t buf, bool free)
 {
-	p2p_debug("conext:%p, buf:%p, free:%d", context,
+	p2p_debug("conext:%pK, buf:%pK, free:%d", context,
 		qdf_nbuf_data(buf), free);
 
 	qdf_nbuf_free(buf);
@@ -129,7 +129,7 @@ QDF_STATUS tgt_p2p_mgmt_ota_comp_cb(void *context, qdf_nbuf_t buf,
 	struct tx_action_context *tx_ctx;
 	struct scheduler_msg msg = {0};
 
-	p2p_debug("context:%p, buf:%p, status:%d, tx complete params:%p",
+	p2p_debug("context:%pK, buf:%pK, status:%d, tx complete params:%pK",
 		context, buf, status, tx_compl_params);
 
 	if (!context) {
@@ -183,7 +183,7 @@ QDF_STATUS tgt_p2p_mgmt_frame_rx_cb(struct wlan_objmgr_psoc *psoc,
 	uint32_t vdev_id;
 	uint8_t *pdata;
 
-	p2p_debug("psoc:%p, peer:%p, type:%d", psoc, peer, frm_type);
+	p2p_debug("psoc:%pK, peer:%pK, type:%d", psoc, peer, frm_type);
 
 	if (!mgmt_rx_params) {
 		p2p_err("mgmt rx params is NULL");
@@ -256,7 +256,7 @@ QDF_STATUS  tgt_p2p_noa_event_cb(struct wlan_objmgr_psoc *psoc,
 	struct scheduler_msg msg = {0};
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 
-	p2p_debug("soc:%p, event_info:%p", psoc, event_info);
+	p2p_debug("soc:%pK, event_info:%pK", psoc, event_info);
 
 	if (!psoc) {
 		p2p_err("psoc context passed is NULL");
@@ -303,7 +303,7 @@ QDF_STATUS tgt_p2p_lo_event_cb(struct wlan_objmgr_psoc *psoc,
 	struct scheduler_msg msg = {0};
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 
-	p2p_debug("soc:%p, event_info:%p", psoc, event_info);
+	p2p_debug("soc:%pK, event_info:%pK", psoc, event_info);
 
 	if (!psoc) {
 		p2p_err("psoc context passed is NULL");

+ 10 - 10
dispatcher/src/wlan_p2p_ucfg_api.c

@@ -52,7 +52,7 @@ static bool is_p2p_ps_allowed(struct wlan_objmgr_vdev *vdev,
 	uint8_t is_p2pgo = 0;
 
 	if (!vdev) {
-		p2p_err("vdev:%p", vdev);
+		p2p_err("vdev:%pK", vdev);
 		return true;
 	}
 	p2p_vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(vdev,
@@ -62,7 +62,7 @@ static bool is_p2p_ps_allowed(struct wlan_objmgr_vdev *vdev,
 		is_p2pgo = 1;
 
 	if (!p2p_vdev_obj || !is_p2pgo) {
-		p2p_err("p2p_vdev_obj:%p is_p2pgo:%u",
+		p2p_err("p2p_vdev_obj:%pK is_p2pgo:%u",
 			p2p_vdev_obj, is_p2pgo);
 		return false;
 	}
@@ -115,7 +115,7 @@ QDF_STATUS ucfg_p2p_roc_req(struct wlan_objmgr_psoc *soc,
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct p2p_roc_context *roc_ctx;
 
-	p2p_debug("soc:%p, vdev_id:%d, chan:%d, phy_mode:%d, duration:%d",
+	p2p_debug("soc:%pK, vdev_id:%d, chan:%d, phy_mode:%d, duration:%d",
 		soc, roc_req->vdev_id, roc_req->chan,
 		roc_req->phy_mode, roc_req->duration);
 
@@ -160,7 +160,7 @@ QDF_STATUS ucfg_p2p_roc_cancel_req(struct wlan_objmgr_psoc *soc,
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct cancel_roc_context *cancel_roc;
 
-	p2p_debug("soc:%p, cookie:0x%llx", soc, cookie);
+	p2p_debug("soc:%pK, cookie:0x%llx", soc, cookie);
 
 	if (!soc) {
 		p2p_err("psoc context passed is NULL");
@@ -196,7 +196,7 @@ QDF_STATUS ucfg_p2p_cleanup_roc(struct wlan_objmgr_vdev *vdev)
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	uint32_t vdev_id;
 
-	p2p_debug("vdev:%p", vdev);
+	p2p_debug("vdev:%pK", vdev);
 
 	if (!vdev) {
 		p2p_err("null vdev");
@@ -227,7 +227,7 @@ QDF_STATUS ucfg_p2p_mgmt_tx(struct wlan_objmgr_psoc *soc,
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct  tx_action_context *tx_action;
 
-	p2p_debug("soc:%p, vdev_id:%d, chan:%d, wait:%d, buf_len:%d, cck:%d, no ack:%d, off chan:%d",
+	p2p_debug("soc:%pK, vdev_id:%d, chan:%d, wait:%d, buf_len:%d, cck:%d, no ack:%d, off chan:%d",
 		soc, mgmt_frm->vdev_id, mgmt_frm->chan,
 		mgmt_frm->wait, mgmt_frm->len, mgmt_frm->no_cck,
 		mgmt_frm->dont_wait_for_ack, mgmt_frm->off_chan);
@@ -286,7 +286,7 @@ QDF_STATUS ucfg_p2p_mgmt_tx_cancel(struct wlan_objmgr_psoc *soc,
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct cancel_roc_context *cancel_tx;
 
-	p2p_debug("soc:%p, cookie:0x%llx", soc, cookie);
+	p2p_debug("soc:%pK, cookie:0x%llx", soc, cookie);
 
 	if (!soc) {
 		p2p_err("psoc context passed is NULL");
@@ -324,7 +324,7 @@ QDF_STATUS ucfg_p2p_set_ps(struct wlan_objmgr_psoc *soc,
 	uint16_t obj_id;
 	struct wlan_objmgr_vdev *vdev;
 
-	p2p_debug("soc:%p, vdev_id:%d, opp_ps:%d, ct_window:%d, count:%d, duration:%d, duration:%d, ps_selection:%d",
+	p2p_debug("soc:%pK, vdev_id:%d, opp_ps:%d, ct_window:%d, count:%d, duration:%d, duration:%d, ps_selection:%d",
 		soc, ps_config->vdev_id, ps_config->opp_ps,
 		ps_config->ct_window, ps_config->count,
 		ps_config->duration, ps_config->single_noa_duration,
@@ -364,7 +364,7 @@ QDF_STATUS ucfg_p2p_lo_start(struct wlan_objmgr_psoc *soc,
 	struct wlan_lmac_if_p2p_tx_ops *p2p_ops;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
-	p2p_debug("soc:%p, vdev_id:%d, ctl_flags:%d, freq:%d, period:%d, interval:%d, count:%d, dev_types_len:%d, probe_resp_len:%d, device_types:%p, probe_resp_tmplt:%p",
+	p2p_debug("soc:%pK, vdev_id:%d, ctl_flags:%d, freq:%d, period:%d, interval:%d, count:%d, dev_types_len:%d, probe_resp_len:%d, device_types:%pK, probe_resp_tmplt:%pK",
 		soc, p2p_lo_start->vdev_id, p2p_lo_start->ctl_flags,
 		p2p_lo_start->freq, p2p_lo_start->period,
 		p2p_lo_start->interval, p2p_lo_start->count,
@@ -391,7 +391,7 @@ QDF_STATUS ucfg_p2p_lo_stop(struct wlan_objmgr_psoc *soc,
 	struct wlan_lmac_if_p2p_tx_ops *p2p_ops;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
-	p2p_debug("soc:%p, vdev_id:%d", soc, vdev_id);
+	p2p_debug("soc:%pK, vdev_id:%d", soc, vdev_id);
 
 	if (!soc) {
 		p2p_err("psoc context passed is NULL");