Merge "qca-wifi: Fix format string related warnings"

target_if/cfr/src/target_if_cfr_8074v2.c

@@ -234,7 +234,8 @@ bool cfr_dbr_event_handler(struct wlan_objmgr_pdev *pdev,
 	data = payload->vaddr;
 	cookie = payload->cookie;
 
-	cfr_debug("bufferaddr: 0x%pK cookie: %u", payload->paddr, cookie);
+	cfr_debug("bufferaddr: 0x%pK cookie: %u",
+		  (void *)((uintptr_t)payload->paddr), cookie);
 	qdf_mem_copy(&dma_hdr, &data[0], sizeof(struct whal_cfir_dma_hdr));
 
 	dump_dma_hdr(&dma_hdr, 0);
@@ -447,14 +448,15 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen)
 	if (target_if_dbr_cookie_lookup(pdev, DBR_MODULE_CFR, buf_addr,
 					&cookie, 0)) {
 		cfr_debug("Cookie lookup failure for addr: 0x%pK status: 0x%x",
-		buf_addr, tx_evt_param.status);
+			  (void *)((uintptr_t)buf_addr), tx_evt_param.status);
 		wlan_objmgr_psoc_release_ref(psoc, WLAN_CFR_ID);
 		wlan_objmgr_vdev_release_ref(vdev, WLAN_CFR_ID);
 		wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
 		return -EINVAL;
 	}
 
-	cfr_debug("buffer address: 0x%pK cookie: %u", buf_addr, cookie);
+	cfr_debug("buffer address: 0x%pK cookie: %u",
+		  (void *)((uintptr_t)buf_addr), cookie);
 
 	lut = &pdev_cfrobj->lut[cookie];
 	lut->tx_ppdu_id = (tx_evt_param.correlation_info_2 >> 16);
@@ -507,7 +509,7 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen)
 		cfr_debug("Data sent to upper layers, releasing look up table");
 	} else if (status == STATUS_HOLD) {
 		cfr_debug("HOLD for buffer address: 0x%pK cookie: %u",
-			  buf_addr, cookie);
+			  (void *)((uintptr_t)buf_addr), cookie);
 	} else {
 		cfr_err("Correlation returned invalid status!!");
 		wlan_objmgr_psoc_release_ref(psoc, WLAN_CFR_ID);

target_if/cfr/src/target_if_cfr_wifi2_0.c

@@ -96,7 +96,7 @@ QDF_STATUS ol_txrx_htt_cfr_rx_ind_handler(void *pdev_ptr,
 	status = wlan_objmgr_pdev_try_get_ref(pdev, WLAN_CFR_ID);
 
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfr_err("%s,%d unable to get reference", __func__, __LINE__);
+		cfr_err("unable to get reference");
 		return status;
 	}
 
@@ -213,8 +213,8 @@ QDF_STATUS ol_txrx_htt_cfr_rx_ind_handler(void *pdev_ptr,
 				prindex, cfr_dump_len, &end_magic, 4);
 	}
 
-	cfr_debug("CFR:%s status=%d rindex=%x dump_len=%d\n", __func__,
-		    cfr_cap_status, prindex, cfr_dump_len);
+	cfr_debug("CFR: status=%d rindex=0x%pK dump_len=%d\n",
+		  cfr_cap_status, prindex, cfr_dump_len);
 
 	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
 
@@ -264,7 +264,7 @@ cfr_wifi2_0_init_pdev(struct wlan_objmgr_psoc *psoc,
 				read_offset = pa->cfr_mem_chunk.vaddr;
 				(*read_offset) =
 				    CFR_CAPTURE_HOST_MEM_DEFAULT_READ_OFFSET;
-				cfr_debug("CFR:%s reqid=%d len=%d\n", __func__,
+				cfr_debug("CFR: reqid=%d len=%d\n",
 					pa->cfr_mem_chunk.req_id,
 					pa->cfr_mem_chunk.len);
 			}