Merge "qcacmn: hif: Replace instances of unadorned %p" into wlan-cmn.driver.lnx.1.0

10 files changed, 37 insertions, 37 deletions

diff --git a/hif/src/ath_procfs.c b/hif/src/ath_procfs.c
index 2ab31972f82e..93a14ddd1ed7 100644
--- a/hif/src/ath_procfs.c
+++ b/hif/src/ath_procfs.c
@@ -79,7 +79,7 @@ static ssize_t ath_procfs_diag_read(struct file *file, char __user *buf,
 	}
 
 	hif_hdl = get_hif_hdl_from_file(file);
-	HIF_DBG("rd buff 0x%p cnt %zu offset 0x%x buf 0x%p",
+	HIF_DBG("rd buff 0x%pK cnt %zu offset 0x%x buf 0x%pK",
 		 read_buffer, count, (int)*pos, buf);
 
 	scn = HIF_GET_SOFTC(hif_hdl);
@@ -140,7 +140,7 @@ static ssize_t ath_procfs_diag_write(struct file *file,
 	}
 
 	hif_hdl = get_hif_hdl_from_file(file);
-	HIF_DBG("wr buff 0x%p buf 0x%p cnt %zu offset 0x%x value 0x%x",
+	HIF_DBG("wr buff 0x%pK buf 0x%pK cnt %zu offset 0x%x value 0x%x",
 		 write_buffer, buf, count,
 		 (int)*pos, *((uint32_t *) write_buffer));
 
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index c7ab60bb8d46..783b515c1148 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -1541,7 +1541,7 @@ static inline void hif_ce_do_recv(struct hif_msg_callbacks *msg_callbacks,
 			rxCompletionHandler(msg_callbacks->Context,
 					netbuf, pipe_info->pipe_num);
 	} else {
-		HIF_ERROR("%s: Invalid Rx msg buf:%p nbytes:%d",
+		HIF_ERROR("%s: Invalid Rx msg buf:%pK nbytes:%d",
 				__func__, netbuf, nbytes);
 
 		qdf_nbuf_free(netbuf);
@@ -1647,7 +1647,7 @@ static int hif_completion_thread_startup(struct HIF_CE_state *hif_state)
 		attr = host_ce_config[pipe_num];
 		if (attr.src_nentries) {
 			/* pipe used to send to target */
-			HIF_DBG("%s: pipe_num:%d pipe_info:0x%p",
+			HIF_DBG("%s: pipe_num:%d pipe_info:0x%pK",
 					 __func__, pipe_num, pipe_info);
 			ce_send_cb_register(pipe_info->ce_hdl,
 					    hif_pci_ce_send_done, pipe_info,
diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c
index bbc12271c030..8d98eb842c1c 100644
--- a/hif/src/hif_napi.c
+++ b/hif/src/hif_napi.c
@@ -181,17 +181,17 @@ int hif_napi_create(struct hif_opaque_softc   *hif_ctx,
 
 		init_dummy_netdev(&(napii->netdev));
 
-		NAPI_DEBUG("adding napi=%p to netdev=%p (poll=%p, bdgt=%d)",
+		NAPI_DEBUG("adding napi=%pK to netdev=%pK (poll=%pK, bdgt=%d)",
 			   &(napii->napi), &(napii->netdev), poll, budget);
 		netif_napi_add(&(napii->netdev), &(napii->napi), poll, budget);
 
 		NAPI_DEBUG("after napi_add");
-		NAPI_DEBUG("napi=0x%p, netdev=0x%p",
+		NAPI_DEBUG("napi=0x%pK, netdev=0x%pK",
 			   &(napii->napi), &(napii->netdev));
-		NAPI_DEBUG("napi.dev_list.prev=0x%p, next=0x%p",
+		NAPI_DEBUG("napi.dev_list.prev=0x%pK, next=0x%pK",
 			   napii->napi.dev_list.prev,
 			   napii->napi.dev_list.next);
-		NAPI_DEBUG("dev.napi_list.prev=0x%p, next=0x%p",
+		NAPI_DEBUG("dev.napi_list.prev=0x%pK, next=0x%pK",
 			   napii->netdev.napi_list.prev,
 			   napii->netdev.napi_list.next);
 
@@ -287,10 +287,10 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx,
 		}
 		if (0 == rc) {
 			NAPI_DEBUG("before napi_del");
-			NAPI_DEBUG("napi.dlist.prv=0x%p, next=0x%p",
+			NAPI_DEBUG("napi.dlist.prv=0x%pK, next=0x%pK",
 				  napii->napi.dev_list.prev,
 				  napii->napi.dev_list.next);
-			NAPI_DEBUG("dev.napi_l.prv=0x%p, next=0x%p",
+			NAPI_DEBUG("dev.napi_l.prv=0x%pK, next=0x%pK",
 				   napii->netdev.napi_list.prev,
 				   napii->netdev.napi_list.next);
 
@@ -356,7 +356,7 @@ int hif_napi_lro_flush_cb_register(struct hif_opaque_softc *hif_hdl,
 				}
 				napii->lro_flush_cb = lro_flush_handler;
 				napii->lro_ctx = data;
-				HIF_DBG("Registering LRO for ce_id %d NAPI callback for %d flush_cb %p, lro_data %p\n",
+				HIF_DBG("Registering LRO for ce_id %d NAPI callback for %d flush_cb %pK, lro_data %pK\n",
 					i, napii->id, napii->lro_flush_cb,
 					napii->lro_ctx);
 				rc++;
@@ -398,7 +398,7 @@ void hif_napi_lro_flush_cb_deregister(struct hif_opaque_softc *hif_hdl,
 		for (i = 0; i < scn->ce_count; i++) {
 			napii = napid->napis[i];
 			if (napii) {
-				HIF_DBG("deRegistering LRO for ce_id %d NAPI callback for %d flush_cb %p, lro_data %p\n",
+				HIF_DBG("deRegistering LRO for ce_id %d NAPI callback for %d flush_cb %pK, lro_data %pK\n",
 					i, napii->id, napii->lro_flush_cb,
 					napii->lro_ctx);
 				napii->lro_flush_cb = NULL;
@@ -516,7 +516,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
 		BLACKLIST_OFF_PENDING
 	     } blacklist_pending = BLACKLIST_NOT_PENDING;
 
-	NAPI_DEBUG("%s: -->(event=%d, aux=%p)", __func__, event, data);
+	NAPI_DEBUG("%s: -->(event=%d, aux=%pK)", __func__, event, data);
 
 	if ((napid->state & HIF_NAPI_INITED) == 0) {
 		NAPI_DEBUG("%s: got event when NAPI not initialized",
diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c
index d61d313da219..b7684921e7d8 100644
--- a/hif/src/pcie/if_pci.c
+++ b/hif/src/pcie/if_pci.c
@@ -3368,7 +3368,7 @@ void hif_target_dump_access_log(void)
 
 	for (idx = 0; idx < len; idx++) {
 		cur_idx = (start_idx + idx) % PCIE_ACCESS_LOG_NUM;
-		HIF_ERROR("%s: idx:%d sn:%u wr:%d addr:%p val:%u.",
+		HIF_ERROR("%s: idx:%d sn:%u wr:%d addr:%pK val:%u.",
 		       __func__, idx,
 		       pcie_access_log[cur_idx].seqnum,
 		       pcie_access_log[cur_idx].is_write,
diff --git a/hif/src/sdio/hif_bmi_reg_access.c b/hif/src/sdio/hif_bmi_reg_access.c
index 1abf31e787d0..390d78e28aa5 100644
--- a/hif/src/sdio/hif_bmi_reg_access.c
+++ b/hif/src/sdio/hif_bmi_reg_access.c
@@ -305,7 +305,7 @@ QDF_STATUS hif_reg_based_get_target_info(struct hif_opaque_softc *hif_ctx,
 	struct hif_sdio_dev *device = scn->hif_handle;
 
 	AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-			("BMI Get Target Info: Enter (device: 0x%p)\n",
+			("BMI Get Target Info: Enter (device: 0x%pK)\n",
 			device));
 	cid = BMI_GET_TARGET_INFO;
 	status = hif_bmi_buffer_send(device, (char *) &cid, sizeof(cid));
diff --git a/hif/src/sdio/if_sdio.c b/hif/src/sdio/if_sdio.c
index 57bc70e813b4..b80a851e1f23 100644
--- a/hif/src/sdio/if_sdio.c
+++ b/hif/src/sdio/if_sdio.c
@@ -180,7 +180,7 @@ static A_STATUS hif_sdio_probe(void *context, void *hif_handle)
 			__func__);
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_HIF, QDF_TRACE_LEVEL_INFO,
-			"%s: ramdump base 0x%p size %d\n", __func__,
+			"%s: ramdump base 0x%pK size %d\n", __func__,
 			scn->ramdump_base, (int)scn->ramdump_size);
 	}
 
diff --git a/hif/src/sdio/native_sdio/src/hif.c b/hif/src/sdio/native_sdio/src/hif.c
index d5061895d3da..1ebff6e32faf 100644
--- a/hif/src/sdio/native_sdio/src/hif.c
+++ b/hif/src/sdio/native_sdio/src/hif.c
@@ -630,7 +630,7 @@ hif_read_write(struct hif_sdio_dev *device,
 	AR_DEBUG_ASSERT(device != NULL);
 	AR_DEBUG_ASSERT(device->func != NULL);
 	AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-			("%s: device 0x%p addr 0x%X buffer 0x%p len %d req 0x%X context 0x%p",
+			("%s: device 0x%pK addr 0x%X buffer 0x%pK len %d req 0x%X context 0x%pK",
 			 __func__, device, address, buffer,
 			 length, request, context));
 
@@ -1388,7 +1388,7 @@ void hif_sdio_shutdown(struct hif_softc *hif_ctx)
 		for (i = 0; i < MAX_HIF_DEVICES; ++i) {
 			if (hif_devices[i] && hif_devices[i]->func == NULL) {
 				AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-				("%s: Remove pending hif_device %p\n",
+				("%s: Remove pending hif_device %pK\n",
 					 __func__, hif_devices[i]));
 				del_hif_device(hif_devices[i]);
 				hif_devices[i] = NULL;
@@ -1680,7 +1680,7 @@ static int hif_device_inserted(struct sdio_func *func,
 		}
 		if (i == MAX_HIF_DEVICES) {
 			AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-				("%s: No more hif_devices[] slot for %p",
+				("%s: No more hif_devices[] slot for %pK",
 				 __func__, device));
 		}
 
@@ -1945,7 +1945,7 @@ struct bus_request *hif_allocate_bus_request(struct hif_sdio_dev *device)
 	/* Release lock */
 	qdf_spin_unlock_irqrestore(&device->lock);
 	AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-			("%s: hif_allocate_bus_request: 0x%p\n",
+			("%s: hif_allocate_bus_request: 0x%pK\n",
 			__func__, busrequest));
 
 	return busrequest;
@@ -2042,7 +2042,7 @@ static QDF_STATUS hif_enable_func(struct hif_sdio_dev *device,
 	int (*taskFunc)(void *) = NULL;
 	int ret = QDF_STATUS_SUCCESS;
 
-	HIF_ENTER("sdio_func 0x%p", func);
+	HIF_ENTER("sdio_func 0x%pK", func);
 
 	device = get_hif_device(func);
 
@@ -2609,7 +2609,7 @@ static void del_hif_device(struct hif_sdio_dev *device)
 {
 	AR_DEBUG_ASSERT(device != NULL);
 	AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-			("%s: deleting hif device 0x%p\n",
+			("%s: deleting hif device 0x%pK\n",
 				__func__, device));
 	if (device->dma_buffer != NULL)
 		qdf_mem_free(device->dma_buffer);
diff --git a/hif/src/usb/hif_usb.c b/hif/src/usb/hif_usb.c
index e184da824229..2557118cdc8a 100644
--- a/hif/src/usb/hif_usb.c
+++ b/hif/src/usb/hif_usb.c
@@ -135,7 +135,7 @@ static QDF_STATUS hif_send_internal(HIF_DEVICE_USB *hif_usb_device,
 	int frag_count = 0, head_data_len, tmp_frag_count = 0;
 	unsigned char *data_ptr;
 
-	HIF_DBG("+%s pipe : %d, buf:0x%p nbytes %u",
+	HIF_DBG("+%s pipe : %d, buf:0x%pK nbytes %u",
 		__func__, pipe_id, buf, nbytes);
 
 	frag_count = qdf_nbuf_get_num_frags(buf);
@@ -380,7 +380,7 @@ QDF_STATUS hif_usb_device_init(struct hif_usb_softc *sc)
 		device->udev = dev;
 		device->interface = interface;
 
-		HIF_ERROR("%s device %p device->udev %p device->interface %p",
+		HIF_ERROR("%s device %pK device->udev %pK device->interface %pK",
 			__func__,
 			device,
 			device->udev,
@@ -784,7 +784,7 @@ void hif_dump_info(struct hif_opaque_softc *scn)
 		ep_desc = &iface_desc->endpoint[i].desc;
 		if (ep_desc) {
 			HIF_INFO(
-				"ep_desc : %p Index : %d: DescType : %d Addr : %d Maxp : %d Atrrib : %d",
+				"ep_desc : %pK Index : %d: DescType : %d Addr : %d Maxp : %d Atrrib : %d",
 				ep_desc, i, ep_desc->bDescriptorType,
 				ep_desc->bEndpointAddress,
 				ep_desc->wMaxPacketSize,
diff --git a/hif/src/usb/if_usb.c b/hif/src/usb/if_usb.c
index 0a1761dd8185..176e1a0e3cae 100644
--- a/hif/src/usb/if_usb.c
+++ b/hif/src/usb/if_usb.c
@@ -204,7 +204,7 @@ QDF_STATUS hif_usb_enable_bus(struct hif_softc *scn,
 
 	sc = HIF_GET_USB_SOFTC(scn);
 
-	HIF_INFO("%s hif_softc %p usbdev %p interface %p\n",
+	HIF_INFO("%s hif_softc %pK usbdev %pK interface %pK\n",
 		__func__,
 		scn,
 		usbdev,
@@ -602,7 +602,7 @@ void hif_fw_assert_ramdump_pattern(struct hif_usb_softc *sc)
 		fw_ram_seg_addr[i] = (sc->ramdump[i])->mem;
 		HIF_ERROR("FW %s start addr = %#08x\n",
 			fw_ram_seg_name[i], *reg);
-		HIF_ERROR("Memory addr for %s = %p\n",
+		HIF_ERROR("Memory addr for %s = %pK\n",
 			fw_ram_seg_name[i],
 			(sc->ramdump[i])->mem);
 		(sc->ramdump[i])->start_addr = *reg;
diff --git a/hif/src/usb/usbdrv.c b/hif/src/usb/usbdrv.c
index 8385e2773361..e2d0935ee5ca 100644
--- a/hif/src/usb/usbdrv.c
+++ b/hif/src/usb/usbdrv.c
@@ -435,9 +435,9 @@ static void usb_hif_flush_pending_transfers(struct HIF_USB_PIPE *pipe)
 			HIF_WARN("urb_context is NULL");
 			break;
 		}
-		HIF_TRACE("  pending urb ctxt: 0x%p", urb_context);
+		HIF_TRACE("  pending urb ctxt: 0x%pK", urb_context);
 		if (urb_context->urb != NULL) {
-			HIF_TRACE("  killing urb: 0x%p", urb_context->urb);
+			HIF_TRACE("  killing urb: 0x%pK", urb_context->urb);
 			/* killing the URB will cause the completion routines to
 			 * run
 			 */
@@ -517,7 +517,7 @@ static void usb_hif_usb_recv_prestart_complete
 	qdf_nbuf_t buf = NULL;
 	struct HIF_USB_PIPE *pipe = urb_context->pipe;
 
-	HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%p",
+	HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK",
 		__func__,
 		pipe->logical_pipe_num,
 		urb->status, urb->actual_length,
@@ -592,7 +592,7 @@ static void usb_hif_usb_recv_complete(struct urb *urb)
 	struct HIF_USB_PIPE *pipe = urb_context->pipe;
 	struct hif_usb_softc *sc = HIF_GET_USB_SOFTC(pipe->device);
 
-	HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%p",
+	HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK",
 		__func__,
 		pipe->logical_pipe_num,
 		urb->status, urb->actual_length,
@@ -690,7 +690,7 @@ static void usb_hif_usb_recv_bundle_complete(struct urb *urb)
 	uint16_t payloadLen;
 	qdf_nbuf_t new_skb = NULL;
 
-	HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%p",
+	HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK",
 		__func__,
 		pipe->logical_pipe_num,
 		urb->status, urb->actual_length,
@@ -848,7 +848,7 @@ static void usb_hif_post_recv_prestart_transfers(struct HIF_USB_PIPE *recv_pipe,
 				usb_hif_usb_recv_prestart_complete,
 				urb_context);
 
-		HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%p",
+		HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK",
 			recv_pipe->logical_pipe_num,
 			recv_pipe->usb_pipe_handle,
 			recv_pipe->ep_address, buffer_length,
@@ -913,7 +913,7 @@ static void usb_hif_post_recv_transfers(struct HIF_USB_PIPE *recv_pipe,
 				buffer_length,
 				usb_hif_usb_recv_complete, urb_context);
 
-		HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%p",
+		HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK",
 			recv_pipe->logical_pipe_num,
 			recv_pipe->usb_pipe_handle,
 			recv_pipe->ep_address, buffer_length,
@@ -980,7 +980,7 @@ static void usb_hif_post_recv_bundle_transfers(struct HIF_USB_PIPE *recv_pipe,
 				usb_hif_usb_recv_bundle_complete,
 				urb_context);
 
-		HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%p",
+		HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK",
 			recv_pipe->logical_pipe_num,
 			recv_pipe->usb_pipe_handle,
 			recv_pipe->ep_address, buffer_length,
@@ -1198,7 +1198,7 @@ void usb_hif_io_complete(struct HIF_USB_PIPE *pipe)
 	HIF_ENTER();
 	while ((buf = skb_dequeue(&pipe->io_comp_queue))) {
 		if (pipe->flags & HIF_USB_PIPE_FLAG_TX) {
-			HIF_DBG("+athusb xmit callback buf:0x%p", buf);
+			HIF_DBG("+athusb xmit callback buf:0x%pK", buf);
 			HtcHdr = (HTC_FRAME_HDR *)
 					qdf_nbuf_get_frag_vaddr(buf, 0);
 
@@ -1213,7 +1213,7 @@ void usb_hif_io_complete(struct HIF_USB_PIPE *pipe)
 #endif
 			HIF_DBG("-athusb xmit callback");
 		} else {
-			HIF_DBG("+athusb recv callback buf: 0x%p", buf);
+			HIF_DBG("+athusb recv callback buf: 0x%pK", buf);
 			qdf_nbuf_peek_header(buf, &data, &len);
 
 			if (IS_FW_CRASH_DUMP(*((uint32_t *) data))) {