diff options
| author | Jeff Johnson <jjohnson@codeaurora.org> | 2017-09-18 11:02:02 -0700 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-09-20 14:06:46 -0700 |
| commit | 8be828d13e455a5f5af478da5b19ead396014d97 (patch) | |
| tree | 066d822f107894e9f5bb83aa01d1987ced5af420 | |
| parent | 84e08bdaf8c5768de981134ee98554f040ff7719 (diff) | |
qcacld-2.0: services: Replace instances of unadorned %p
Replace instances of unadorned %p in CORE/SERVICES.
Change-Id: I9fe08e236b1ef687196a0720b9cfed85d1a812a3
CRs-Fixed: 2111273
23 files changed, 104 insertions, 104 deletions
diff --git a/CORE/SERVICES/BMI/bmi.c b/CORE/SERVICES/BMI/bmi.c index da5b6b4365cb..5e89cab08838 100644 --- a/CORE/SERVICES/BMI/bmi.c +++ b/CORE/SERVICES/BMI/bmi.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2012, 2014, 2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014, 2016-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -168,7 +168,7 @@ BMIDone(HIF_DEVICE *device, struct ol_softc *scn) return A_OK; } - AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Enter (device: 0x%p)\n", device)); + AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Enter (device: 0x%pK)\n", device)); #if defined(A_SIMOS_DEVHOST) /* Let HIF layer know that BMI phase is done. @@ -351,7 +351,7 @@ BMIReadMemory(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI Read Memory: Enter (device: 0x%p, address: 0x%x, length: %d)\n", + ("BMI Read Memory: Enter (device: 0x%pK, address: 0x%x, length: %d)\n", device, address, length)); cid = BMI_READ_MEMORY; @@ -422,7 +422,7 @@ BMIWriteMemory(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI Write Memory: Enter (device: 0x%p, address: 0x%x, length: %d)\n", + ("BMI Write Memory: Enter (device: 0x%pK, address: 0x%x, length: %d)\n", device, address, length)); cid = BMI_WRITE_MEMORY; @@ -487,7 +487,7 @@ BMIExecute(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI Execute: Enter (device: 0x%p, address: 0x%x, param: %d)\n", + ("BMI Execute: Enter (device: 0x%pK, address: 0x%x, param: %d)\n", device, address, *param)); cid = BMI_EXECUTE; @@ -531,7 +531,7 @@ BMISetAppStart(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI Set App Start: Enter (device: 0x%p, address: 0x%x)\n", + ("BMI Set App Start: Enter (device: 0x%pK, address: 0x%x)\n", device, address)); cid = BMI_SET_APP_START; @@ -574,7 +574,7 @@ BMIReadSOCRegister(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI Read SOC Register: Enter (device: 0x%p, address: 0x%x)\n", + ("BMI Read SOC Register: Enter (device: 0x%pK, address: 0x%x)\n", device, address)); cid = BMI_READ_SOC_REGISTER; @@ -616,7 +616,7 @@ BMIWriteSOCRegister(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI Write SOC Register: Enter (device: 0x%p, address: 0x%x, param: %d)\n", + ("BMI Write SOC Register: Enter (device: 0x%pK, address: 0x%x, param: %d)\n", device, address, param)); cid = BMI_WRITE_SOC_REGISTER; @@ -660,7 +660,7 @@ BMILZData(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI Send LZ Data: Enter (device: 0x%p, length: %d)\n", + ("BMI Send LZ Data: Enter (device: 0x%pK, length: %d)\n", device, length)); cid = BMI_LZ_DATA; @@ -715,7 +715,7 @@ BMISignStreamStart(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI SIGN Stream Start: Enter (device: 0x%p, address: 0x%x, length: %d)\n", + ("BMI SIGN Stream Start: Enter (device: 0x%pK, address: 0x%x, length: %d)\n", device, address, length)); cid = BMI_SIGN_STREAM_START; @@ -778,7 +778,7 @@ BMILZStreamStart(HIF_DEVICE *device, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI LZ Stream Start: Enter (device: 0x%p, address: 0x%x)\n", + ("BMI LZ Stream Start: Enter (device: 0x%pK, address: 0x%x)\n", device, address)); cid = BMI_LZ_STREAM_START; @@ -857,7 +857,7 @@ BMInvramProcess(HIF_DEVICE *device, A_UCHAR *seg_name, A_UINT32 *retval, } AR_DEBUG_PRINTF(ATH_DEBUG_BMI, - ("BMI NVRAM Process: Enter (device: 0x%p, name: %s)\n", + ("BMI NVRAM Process: Enter (device: 0x%pK, name: %s)\n", device, seg_name)); cid = BMI_NVRAM_PROCESS; diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c index dca80a6f4f02..db88a9bd613e 100644 --- a/CORE/SERVICES/BMI/ol_fw.c +++ b/CORE/SERVICES/BMI/ol_fw.c @@ -1194,11 +1194,11 @@ static void ramdump_work_handler(struct work_struct *ramdump) ol_fw_axi_addr = (void *)(byte_ptr + DRAM_SIZE); ol_fw_iram_addr = (void *)(byte_ptr + DRAM_SIZE + AXI_SIZE); - pr_err("%s: DRAM => mem = %p, len = %d\n", __func__, + pr_err("%s: DRAM => mem = %pK, len = %d\n", __func__, ol_fw_dram_addr, DRAM_SIZE); - pr_err("%s: AXI => mem = %p, len = %d\n", __func__, + pr_err("%s: AXI => mem = %pK, len = %d\n", __func__, ol_fw_axi_addr, AXI_SIZE); - pr_err("%s: IRAM => mem = %p, len = %d\n", __func__, + pr_err("%s: IRAM => mem = %pK, len = %d\n", __func__, ol_fw_iram_addr, IRAM_SIZE); #endif #endif @@ -1380,7 +1380,7 @@ void ol_ramdump_handler(struct ol_softc *scn) fw_ram_seg_addr[i] = (scn->ramdump[i])->mem; pr_err("FW %s start addr = %#08x\n", fw_ram_seg_name[i], *reg); - pr_err("Memory addr for %s = %p\n", + pr_err("Memory addr for %s = %pK\n", fw_ram_seg_name[i], (scn->ramdump[i])->mem); (scn->ramdump[i])->start_addr = *reg; @@ -1494,7 +1494,7 @@ static int __ol_target_failure(struct ol_softc *scn, void *wma_hdl) dbglog_buf.length) != A_OK) pr_err("%s FW dbglog_data failed\n", __func__); else { - pr_info("%s dbglog_hdr.dbuf=%u, dbglog_data=%p," + pr_info("%s dbglog_hdr.dbuf=%u, dbglog_data=%pK," "dbglog_buf.buffer=%u, dbglog_buf.length=%u\n", __func__, dbglog_hdr.dbuf, dbglog_data, dbglog_buf.buffer, dbglog_buf.length); diff --git a/CORE/SERVICES/COMMON/adf/adf_nbuf.c b/CORE/SERVICES/COMMON/adf/adf_nbuf.c index bb8fd7be1234..1f9cd2c6d6a9 100644 --- a/CORE/SERVICES/COMMON/adf/adf_nbuf.c +++ b/CORE/SERVICES/COMMON/adf/adf_nbuf.c @@ -1564,7 +1564,7 @@ void adf_net_buf_debug_add_node(adf_nbuf_t net_buf, size_t size, p_node = adf_net_buf_debug_look_up(net_buf); if (p_node) { - adf_print("Double allocation of skb ! Already allocated from %p %s %d current alloc from %p %s %d", + adf_print("Double allocation of skb ! Already allocated from %pK %s %d current alloc from %pK %s %d", p_node->net_buf, p_node->file_name, p_node->line_num, net_buf, file_name, line_num); adf_os_warn(1); @@ -1639,7 +1639,7 @@ done: spin_unlock_irqrestore(&g_adf_net_buf_track_lock[i], irq_flag); if (!found) { - adf_print("Unallocated buffer ! Double free of net_buf %p ?", + adf_print("Unallocated buffer ! Double free of net_buf %pK ?", net_buf); adf_os_warn(1); } else { diff --git a/CORE/SERVICES/COMMON/isoc_hw_desc.h b/CORE/SERVICES/COMMON/isoc_hw_desc.h index 7e4e7df2fc69..c48dfc6d9e39 100644 --- a/CORE/SERVICES/COMMON/isoc_hw_desc.h +++ b/CORE/SERVICES/COMMON/isoc_hw_desc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1091,7 +1091,7 @@ static inline void char *p; int i; - adf_os_print("Tx BD (%p)\n", tx_bd); + adf_os_print("Tx BD (%pK)\n", tx_bd); adf_os_print("structured view:\n"); adf_os_print(" BD type: %d\n", tx_bd->bd_type); @@ -1140,7 +1140,7 @@ static inline void char *p; int i; - adf_os_print("Rx BD (%p)\n", rx_bd); + adf_os_print("Rx BD (%pK)\n", rx_bd); adf_os_print("structured view:\n"); adf_os_print(" BD type: %d\n", rx_bd->bd_type); diff --git a/CORE/SERVICES/COMMON/ol_htt_tx_api.h b/CORE/SERVICES/COMMON/ol_htt_tx_api.h index 1a1b1e4ab586..353b10605039 100644 --- a/CORE/SERVICES/COMMON/ol_htt_tx_api.h +++ b/CORE/SERVICES/COMMON/ol_htt_tx_api.h @@ -297,7 +297,7 @@ static inline void htt_msdu_info_dump(struct htt_msdu_info_t *msdu_info) { VOS_TRACE(VOS_MODULE_ID_TXRX, VOS_TRACE_LEVEL_INFO_LOW, - "HTT MSDU info object (%p)\n", msdu_info); + "HTT MSDU info object (%pK)\n", msdu_info); VOS_TRACE(VOS_MODULE_ID_TXRX, VOS_TRACE_LEVEL_INFO_LOW, " ethertype: %#x\n", msdu_info->info.ethertype); VOS_TRACE(VOS_MODULE_ID_TXRX, VOS_TRACE_LEVEL_INFO_LOW, diff --git a/CORE/SERVICES/COMMON/osdep_adf.h b/CORE/SERVICES/COMMON/osdep_adf.h index 9d7f0cf2d412..4e2ff99eb516 100644 --- a/CORE/SERVICES/COMMON/osdep_adf.h +++ b/CORE/SERVICES/COMMON/osdep_adf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014, 2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -290,7 +290,7 @@ do { \ do { \ if (!spin_is_locked(x)) { \ WARN_ON(1); \ -printk(KERN_EMERG " %s:%d unlock addr=%p, %s \n", __func__, __LINE__, x, \ +printk(KERN_EMERG " %s:%d unlock addr=%pK, %s \n", __func__, __LINE__, x, \ !spin_is_locked(x)? "Not locked":""); \ } \ spin_unlock_bh(x);\ diff --git a/CORE/SERVICES/DFS/src/dfs.c b/CORE/SERVICES/DFS/src/dfs.c index f118f0a1ad36..73884eb001fc 100644 --- a/CORE/SERVICES/DFS/src/dfs.c +++ b/CORE/SERVICES/DFS/src/dfs.c @@ -860,7 +860,7 @@ dfs_control(struct ieee80211com *ic, u_int id, case DFS_SET_THRESH: if (insize < sizeof(struct dfs_ioctl_params) || !indata) { DFS_DPRINTK(dfs, ATH_DEBUG_DFS1, - "%s: insize=%d, expected=%zu bytes, indata=%p\n", + "%s: insize=%d, expected=%zu bytes, indata=%pK\n", __func__, insize, sizeof(struct dfs_ioctl_params), indata); error = -EINVAL; diff --git a/CORE/SERVICES/DFS/src/dfs_fcc_bin5.c b/CORE/SERVICES/DFS/src/dfs_fcc_bin5.c index 5e9d2cbd5de2..cae0abc25564 100644 --- a/CORE/SERVICES/DFS/src/dfs_fcc_bin5.c +++ b/CORE/SERVICES/DFS/src/dfs_fcc_bin5.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2013, 2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -359,7 +359,7 @@ dfs_check_chirping_sowl(struct ath_dfs *dfs, void *buf, /* DEBUG - Print relevant portions of the FFT data*/ for (p=0; p < num_fft_packets; p++) { - DFS_DPRINTK(dfs, ATH_DEBUG_DFS_BIN5_FFT, "fft_data_ptr=0x%p\t", fft_data_ptr); + DFS_DPRINTK(dfs, ATH_DEBUG_DFS_BIN5_FFT, "fft_data_ptr=0x%pK\t", fft_data_ptr); DFS_DPRINTK(dfs, ATH_DEBUG_DFS_BIN5_FFT, "[66]=%d [69]=%d\n", *(fft_data_ptr+FFT_LOWER_BIN_MAX_INDEX_BYTE) >> 2, diff --git a/CORE/SERVICES/DFS/src/dfs_init.c b/CORE/SERVICES/DFS/src/dfs_init.c index 122df0153b52..445027bc4f6d 100644 --- a/CORE/SERVICES/DFS/src/dfs_init.c +++ b/CORE/SERVICES/DFS/src/dfs_init.c @@ -86,13 +86,13 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs) if (pl == NULL) { VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, - "%s[%d]: pl==NULL, dfs=%p", __func__, __LINE__, dfs); + "%s[%d]: pl==NULL, dfs=%pK", __func__, __LINE__, dfs); return; } if (dfs->dfs_b5radars == NULL) { VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, - "%s[%d]: pl==NULL, b5radars=%p", __func__, __LINE__, dfs->dfs_b5radars); + "%s[%d]: pl==NULL, b5radars=%pK", __func__, __LINE__, dfs->dfs_b5radars); return; } diff --git a/CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c b/CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c index 361927111f91..768493adefab 100644 --- a/CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c +++ b/CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c @@ -222,7 +222,7 @@ radar_summary_parse(struct ath_dfs *dfs, const char *buf, size_t len, OS_MEMCPY(rs, buf, sizeof(rs)); DFS_DPRINTK(dfs, ATH_DEBUG_DFS_PHYERR,"%s: two 32 bit values are: %08x %08x", __func__, rs[0], rs[1]); -// DFS_DPRINTK(dfs, ATH_DEBUG_DFS_PHYERR, "%s (p=%p):", __func__, buf); +// DFS_DPRINTK(dfs, ATH_DEBUG_DFS_PHYERR, "%s (p=%pK):", __func__, buf); /* Populate the fields from the summary report */ rsu->tsf_offset = @@ -445,7 +445,7 @@ tlv_calc_freq_info(struct ath_dfs *dfs, struct rx_radar_status *rs) * For now, just handle up to VHT80 correctly. */ if (dfs->ic == NULL || dfs->ic->ic_curchan == NULL) { - DFS_PRINTK("%s: dfs->ic=%p, that or curchan is null?", + DFS_PRINTK("%s: dfs->ic=%pK, that or curchan is null?", __func__, dfs->ic); return (0); } diff --git a/CORE/SERVICES/HIF/PCIe/hif_pci.c b/CORE/SERVICES/HIF/PCIe/hif_pci.c index bfcb639e94ed..6be7ef271cfb 100644 --- a/CORE/SERVICES/HIF/PCIe/hif_pci.c +++ b/CORE/SERVICES/HIF/PCIe/hif_pci.c @@ -464,7 +464,7 @@ HIF_PCI_CE_send_done(struct CE_handle *copyeng, void *ce_context, void *transfer adf_os_spin_unlock(&pipe_info->completion_freeq_lock); AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Out of free buf in hif send completion list, potential hw_index corruption" - "pipe_num:%d num_send_allowed:%d pipe_info:0x%p sw_index:%d hw_index:%d nbytes:%d\n", + "pipe_num:%d num_send_allowed:%d pipe_info:0x%pK sw_index:%d hw_index:%d nbytes:%d\n", pipe_info->pipe_num, pipe_info->num_sends_allowed, pipe_info, sw_idx, hw_idx, nbytes)); ce_target_reset(hif_state->sc); @@ -660,7 +660,7 @@ hif_completion_thread_startup(struct HIF_CE_state *hif_state) attr = host_CE_config[pipe_num]; completions_needed = 0; if (attr.src_nentries) { /* pipe used to send to target */ - AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("pipe_num:%d pipe_info:0x%p\n", + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("pipe_num:%d pipe_info:0x%pK\n", pipe_num, pipe_info)); CE_send_cb_register(pipe_info->ce_hdl, HIF_PCI_CE_send_done, pipe_info, attr.flags & CE_ATTR_DISABLE_INTR); completions_needed += attr.src_nentries; @@ -860,13 +860,13 @@ hif_completion_thread(struct HIF_CE_state *hif_state) To see the following debug output, enable the HIF_PCI_DEBUG flag in the debug module declaration in this source file */ - AR_DEBUG_PRINTF(HIF_PCI_DEBUG,("HIF_PCI_CE_recv_data netbuf=%p nbytes=%d\n", netbuf, nbytes)); + AR_DEBUG_PRINTF(HIF_PCI_DEBUG,("HIF_PCI_CE_recv_data netbuf=%pK nbytes=%d\n", netbuf, nbytes)); if (nbytes <= pipe_info->buf_sz) { adf_nbuf_set_pktlen(netbuf, nbytes); msg_callbacks->rxCompletionHandler(msg_callbacks->Context, netbuf, pipe_info->pipe_num); } else { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Rx message netbuf:%p nbytes:%d\n", + AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Rx message netbuf:%pK nbytes:%d\n", netbuf, nbytes)); adf_nbuf_free(netbuf); } @@ -3025,7 +3025,7 @@ HIFTargetDumpAccessLog(void) for(idx = 0; idx < len; idx++) { cur_idx = (start_idx + idx) % PCIE_ACCESS_LOG_NUM; - printk("idx:%d\t sn:%u wr:%d addr:%p val:%u.\n", + printk("idx:%d\t sn:%u wr:%d addr:%pK val:%u.\n", idx, pcie_access_log[cur_idx].seqnum, pcie_access_log[cur_idx].is_write, diff --git a/CORE/SERVICES/HIF/USB/hif_usb.c b/CORE/SERVICES/HIF/USB/hif_usb.c index 47bea8324a02..02888082d2ea 100644 --- a/CORE/SERVICES/HIF/USB/hif_usb.c +++ b/CORE/SERVICES/HIF/USB/hif_usb.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -248,7 +248,7 @@ static A_STATUS HIFSend_internal(HIF_DEVICE *hifDevice, a_uint8_t PipeID, int frag_count = 0, head_data_len, tmp_frag_count = 0; unsigned char *pData; - AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_OUT, ("+%s pipe : %d, buf:0x%p\n", + AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_OUT, ("+%s pipe : %d, buf:0x%pK\n", __func__, PipeID, buf)); a_mem_trace(buf); @@ -905,7 +905,7 @@ void HIFDumpInfo(HIF_DEVICE *hif) ep_desc = &iface_desc->endpoint[i].desc; if (ep_desc) { pr_info( - "ep_desc : %p Index : %d: DescType : %d Addr : %d Maxp : %d Atrrib : %d\n", + "ep_desc : %pK Index : %d: DescType : %d Addr : %d Maxp : %d Atrrib : %d\n", ep_desc, i, ep_desc->bDescriptorType, ep_desc->bEndpointAddress, ep_desc->wMaxPacketSize, diff --git a/CORE/SERVICES/HIF/USB/usbdrv.c b/CORE/SERVICES/HIF/USB/usbdrv.c index 112cd71565a5..e5011302e40b 100644 --- a/CORE/SERVICES/HIF/USB/usbdrv.c +++ b/CORE/SERVICES/HIF/USB/usbdrv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -381,11 +381,11 @@ static void usb_hif_flush_pending_transfers(HIF_USB_PIPE *pipe) ("urb_context is NULL\n")); break; } - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" pending urb ctxt: 0x%p\n", + AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" pending urb ctxt: 0x%pK\n", urb_context)); if (urb_context->urb != NULL) { AR_DEBUG_PRINTF(ATH_DEBUG_TRC, - (" killing urb: 0x%p\n", + (" killing urb: 0x%pK\n", urb_context->urb)); /* killing the URB will cause the completion routines to * run @@ -442,7 +442,7 @@ static void usb_hif_usb_recv_prestart_complete(struct urb *urb) unsigned long flags; AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_IN, ( - "+%s: recv pipe: %d, stat:%d,len:%d urb:0x%p\n", + "+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK\n", __func__, pipe->logical_pipe_num, urb->status, urb->actual_length, @@ -519,7 +519,7 @@ static void usb_hif_usb_recv_complete(struct urb *urb) HIF_USB_PIPE *pipe = urb_context->pipe; AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_IN, ( - "+%s: recv pipe: %d, stat:%d,len:%d urb:0x%p\n", + "+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK\n", __func__, pipe->logical_pipe_num, urb->status, urb->actual_length, @@ -619,7 +619,7 @@ static void usb_hif_usb_recv_bundle_complete(struct urb *urb) adf_nbuf_t new_skb = NULL; AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_IN, ( - "+%s: recv pipe: %d, stat:%d,len:%d urb:0x%p\n", + "+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK\n", __func__, pipe->logical_pipe_num, urb->status, urb->actual_length, @@ -791,7 +791,7 @@ static void usb_hif_post_recv_prestart_transfers(HIF_USB_PIPE *recv_pipe, urb_context); AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_IN, ( - "athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%p\n", + "athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK\n", recv_pipe->logical_pipe_num, recv_pipe->usb_pipe_handle, recv_pipe->ep_address, buffer_length, @@ -854,7 +854,7 @@ static void usb_hif_post_recv_transfers(HIF_USB_PIPE *recv_pipe, usb_hif_usb_recv_complete, urb_context); AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_IN, ( - "athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%p\n", + "athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK\n", recv_pipe->logical_pipe_num, recv_pipe->usb_pipe_handle, recv_pipe->ep_address, buffer_length, @@ -917,7 +917,7 @@ static void usb_hif_post_recv_bundle_transfers(HIF_USB_PIPE *recv_pipe, urb_context); AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_IN, ( - "athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%p\n", + "athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK\n", recv_pipe->logical_pipe_num, recv_pipe->usb_pipe_handle, recv_pipe->ep_address, buffer_length, @@ -1120,7 +1120,7 @@ void usb_hif_io_comp_work(struct work_struct *work) a_mem_trace(buf); if (pipe->flags & HIF_USB_PIPE_FLAG_TX) { AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_OUT, - ("+athusb xmit callback " "buf:0x%p\n", + ("+athusb xmit callback " "buf:0x%pK\n", buf)); HtcHdr = (HTC_FRAME_HDR *) adf_nbuf_get_frag_vaddr(buf, 0); @@ -1137,7 +1137,7 @@ void usb_hif_io_comp_work(struct work_struct *work) ("-athusb xmit callback\n")); } else { AR_DEBUG_PRINTF(USB_HIF_DEBUG_BULK_IN, - ("+athusb recv callback buf:" "0x%p\n", + ("+athusb recv callback buf:" "0x%pK\n", buf)); adf_nbuf_peek_header(buf, &data, &len); diff --git a/CORE/SERVICES/HIF/ath_procfs.c b/CORE/SERVICES/HIF/ath_procfs.c index d1a34dd6c396..0dca014ab71b 100644 --- a/CORE/SERVICES/HIF/ath_procfs.c +++ b/CORE/SERVICES/HIF/ath_procfs.c @@ -100,7 +100,7 @@ static ssize_t ath_procfs_diag_read(struct file *file, char __user *buf, return -EINVAL; } - pr_debug("rd buff 0x%p cnt %zu offset 0x%x buf 0x%p\n", + pr_debug("rd buff 0x%pK cnt %zu offset 0x%x buf 0x%pK\n", read_buffer,count, (int)*pos, buf); @@ -145,7 +145,7 @@ static ssize_t ath_procfs_diag_write(struct file *file, const char __user *buf, return -EFAULT; } - pr_debug("wr buff 0x%p buf 0x%p cnt %zu offset 0x%x value 0x%x\n", + pr_debug("wr buff 0x%pK buf 0x%pK cnt %zu offset 0x%x value 0x%x\n", write_buffer, buf, count, (int)*pos, *((A_UINT32 *)write_buffer)); diff --git a/CORE/SERVICES/HIF/common/hif_bmi_reg_access.c b/CORE/SERVICES/HIF/common/hif_bmi_reg_access.c index 869b8bc1c0de..2f393c21ff50 100644 --- a/CORE/SERVICES/HIF/common/hif_bmi_reg_access.c +++ b/CORE/SERVICES/HIF/common/hif_bmi_reg_access.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014,2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014,2016-2017 The Linux Foundation. All rights reserved. * *Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -295,7 +295,7 @@ A_STATUS HIFRegBasedGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *ta msleep(100); } - AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Enter (device: 0x%p)\n", device)); + AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Enter (device: 0x%pK)\n", device)); cid = BMI_GET_TARGET_INFO; status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid)); diff --git a/CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c b/CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c index 468762b0cf14..24bf785dd0c5 100644 --- a/CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c +++ b/CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c @@ -234,7 +234,7 @@ ath_hif_sdio_probe(void *context, void *hif_handle) __func__); } else { VOS_TRACE(VOS_MODULE_ID_HIF, VOS_TRACE_LEVEL_INFO, - "%s: ramdump base 0x%p size %d\n", + "%s: ramdump base 0x%pK size %d\n", __func__, ol_sc->ramdump_base, (int)ol_sc->ramdump_size); } init_waitqueue_head(&ol_sc->sc_osdev->event_queue); diff --git a/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c b/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c index 54964779b6c4..416a682fed3f 100644 --- a/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c +++ b/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c @@ -652,7 +652,7 @@ HIFReadWrite(HIF_DEVICE *device, if (device == NULL || device->func == NULL) return A_ERROR; AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, - ("AR6000: device 0x%p addr 0x%X buffer 0x%p len %d req 0x%X context 0x%p", + ("AR6000: device 0x%pK addr 0x%X buffer 0x%pK len %d req 0x%X context 0x%pK", device, address, buffer, length, request, context)); /*sdio r/w action is not needed when suspend with cut power,so just return*/ @@ -1427,7 +1427,7 @@ HIFShutDownDevice(HIF_DEVICE *device) for (i=0; i<MAX_HIF_DEVICES; ++i) { if (hif_devices[i] && hif_devices[i]->func == NULL) { AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, - ("AR6000: Remove pending hif_device %p\n", hif_devices[i])); + ("AR6000: Remove pending hif_device %pK\n", hif_devices[i])); delHifDevice(hif_devices[i]); hif_devices[i] = NULL; } @@ -1574,7 +1574,7 @@ static int hifDeviceInserted(struct sdio_func *func, const struct sdio_device_id } if (i==MAX_HIF_DEVICES) { AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, - ("AR6000: hifDeviceInserted, No more hif_devices[] slot for %p", device)); + ("AR6000: hifDeviceInserted, No more hif_devices[] slot for %pK", device)); } device->id = id; @@ -1946,7 +1946,7 @@ BUS_REQUEST *hifAllocateBusRequest(HIF_DEVICE *device) sema_init(&busrequest->sem_req, 0); } } - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: hifAllocateBusRequest: 0x%p\n", busrequest)); + AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: hifAllocateBusRequest: 0x%pK\n", busrequest)); return busrequest; } @@ -1957,7 +1957,7 @@ hifFreeBusRequest(HIF_DEVICE *device, BUS_REQUEST *busrequest) if (busrequest == NULL) return; - //AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: hifFreeBusRequest: 0x%p\n", busrequest)); + //AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: hifFreeBusRequest: 0x%pK\n", busrequest)); /* Acquire lock */ spin_lock_irqsave(&device->lock, flag); @@ -2031,7 +2031,7 @@ static A_STATUS hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func) { int ret = A_OK; - ENTER("sdio_func 0x%p", func); + ENTER("sdio_func 0x%pK", func); AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifEnableFunc\n")); device = getHifDevice(func); @@ -2638,7 +2638,7 @@ delHifDevice(HIF_DEVICE * device) { if (device == NULL) return; - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: delHifDevice; 0x%p\n", device)); + AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: delHifDevice; 0x%pK\n", device)); if (dynamic_busreq) hif_release_bus_requests(device); diff --git a/CORE/SERVICES/HTC/htc.c b/CORE/SERVICES/HTC/htc.c index e876bf0725d3..09120e5c6761 100644 --- a/CORE/SERVICES/HTC/htc.c +++ b/CORE/SERVICES/HTC/htc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -65,7 +65,7 @@ static void DestroyHTCTxCtrlPacket(HTC_PACKET *pPacket) { adf_nbuf_t netbuf; netbuf = (adf_nbuf_t)GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("free ctrl netbuf :0x%p \n", netbuf)); + AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("free ctrl netbuf :0x%pK \n", netbuf)); if (netbuf != NULL) { adf_nbuf_free(netbuf); } @@ -92,7 +92,7 @@ static HTC_PACKET *BuildHTCTxCtrlPacket(adf_os_device_t osdev) adf_os_print("%s: nbuf alloc failed\n",__func__); break; } - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("alloc ctrl netbuf :0x%p \n", netbuf)); + AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("alloc ctrl netbuf :0x%pK \n", netbuf)); SET_HTC_PACKET_NET_BUF_CONTEXT(pPacket, netbuf); } while (FALSE); @@ -228,7 +228,7 @@ HTC_HANDLE HTCCreate(void *ol_sc, HTC_INIT_INFO *pInfo, adf_os_device_t osdev) HTC_TARGET *target = NULL; int i, j; - AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("+HTCCreate .. HIF :%p \n",hHIF)); + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("+HTCCreate .. HIF :%pK \n",hHIF)); A_REGISTER_MODULE_DEBUG_INFO(htc); @@ -297,7 +297,7 @@ HTC_HANDLE HTCCreate(void *ol_sc, HTC_INIT_INFO *pInfo, adf_os_device_t osdev) HTCRecvInit(target); - AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("-HTCCreate (0x%p) \n", target)); + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("-HTCCreate (0x%pK) \n", target)); return (HTC_HANDLE)target; } @@ -305,7 +305,7 @@ HTC_HANDLE HTCCreate(void *ol_sc, HTC_INIT_INFO *pInfo, adf_os_device_t osdev) void HTCDestroy(HTC_HANDLE HTCHandle) { HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCDestroy .. Destroying :0x%p \n",target)); + AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCDestroy .. Destroying :0x%pK \n",target)); HIFStop(HTCGetHifDevice(HTCHandle)); HTCCleanup(target); AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCDestroy \n")); @@ -322,7 +322,7 @@ void *HTCGetHifDevice(HTC_HANDLE HTCHandle) void HTCControlTxComplete(void *Context, HTC_PACKET *pPacket) { HTC_TARGET *target = (HTC_TARGET *)Context; - AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+-HTCControlTxComplete 0x%p (l:%d) \n",pPacket,pPacket->ActualLength)); + AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+-HTCControlTxComplete 0x%pK (l:%d) \n",pPacket,pPacket->ActualLength)); HTCFreeControlTxPacket(target,pPacket); } @@ -539,7 +539,7 @@ A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle) A_UINT8 i = 0; HTC_PACKET *pRxBundlePacket, *pTempBundlePacket; - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Enter (target:0x%p) \n", HTCHandle)); + AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Enter (target:0x%pK) \n", HTCHandle)); AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("+HWT\n")); do { diff --git a/CORE/SERVICES/HTC/htc_recv.c b/CORE/SERVICES/HTC/htc_recv.c index e78121f0b2b5..8529941858c5 100644 --- a/CORE/SERVICES/HTC/htc_recv.c +++ b/CORE/SERVICES/HTC/htc_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -106,12 +106,12 @@ static void DoRecvCompletion(HTC_ENDPOINT *pEndpoint, pPacket = HTC_PACKET_DEQUEUE(pQueueToIndicate); LOCK_HTC_ENDPOINT_RX(pEndpoint); if (pEndpoint->EpCallBacks.EpRecv == NULL) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("HTC ep %d has NULL recv callback on packet %p\n", + AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("HTC ep %d has NULL recv callback on packet %pK\n", pEndpoint->Id, pPacket)); UNLOCK_HTC_ENDPOINT_RX(pEndpoint); continue; } - AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("HTC calling ep %d recv callback on packet %p\n", + AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("HTC calling ep %d recv callback on packet %pK\n", pEndpoint->Id, pPacket)); pEndpoint->EpCallBacks.EpRecv(pEndpoint->EpCallBacks.pContext, pPacket); UNLOCK_HTC_ENDPOINT_RX(pEndpoint); @@ -556,7 +556,7 @@ void HTCFlushRxHoldQueue(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint) UNLOCK_HTC_RX(target); pPacket->Status = A_ECANCELED; pPacket->ActualLength = 0; - AR_DEBUG_PRINTF(ATH_DEBUG_RECV, (" Flushing RX packet:%p, length:%d, ep:%d \n", + AR_DEBUG_PRINTF(ATH_DEBUG_RECV, (" Flushing RX packet:%pK, length:%d, ep:%d \n", pPacket, pPacket->BufferLength, pPacket->Endpoint)); INIT_HTC_PACKET_QUEUE_AND_ADD(&container,pPacket); /* give the packet back */ diff --git a/CORE/SERVICES/HTC/htc_send.c b/CORE/SERVICES/HTC/htc_send.c index 8c359c867241..627aafe3e12c 100644 --- a/CORE/SERVICES/HTC/htc_send.c +++ b/CORE/SERVICES/HTC/htc_send.c @@ -137,7 +137,7 @@ static void DoSendCompletion(HTC_ENDPOINT *pEndpoint, /* using legacy EpTxComplete */ do { pPacket = HTC_PACKET_DEQUEUE(pQueueToIndicate); - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" HTC calling ep %d send complete callback on packet %p \n", + AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" HTC calling ep %d send complete callback on packet %pK \n", pEndpoint->Id, pPacket)); pEndpoint->EpCallBacks.EpTxComplete(pEndpoint->EpCallBacks.pContext, pPacket); } while (!HTC_QUEUE_EMPTY(pQueueToIndicate)); @@ -585,7 +585,7 @@ static A_STATUS HTCIssuePackets(HTC_TARGET *target, HTC_FRAME_HDR *pHtcHdr; bool is_tx_runtime_put = false; - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCIssuePackets: Queue: %p, Pkts %d \n", + AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCIssuePackets: Queue: %pK, Pkts %d \n", pPktQueue, HTC_PACKET_QUEUE_DEPTH(pPktQueue))); while (TRUE) { #if defined(HIF_USB) || defined(HIF_SDIO) @@ -707,7 +707,7 @@ static A_STATUS HTCIssuePackets(HTC_TARGET *target, if (adf_os_unlikely(A_FAILED(status))) AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("htc_issue_packets, failed pkt:0x%p status:%d", + ("htc_issue_packets, failed pkt:0x%pK status:%d", pPacket, status)); AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCIssuePackets \n")); @@ -813,7 +813,7 @@ void GetHTCSendPacketsCreditBased(HTC_TARGET *target, break; } - AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Got head packet:%p , Queue Depth: %d\n", + AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Got head packet:%pK , Queue Depth: %d\n", pPacket, HTC_PACKET_QUEUE_DEPTH(pTxQueue))); transferLength = pPacket->ActualLength + HTC_HDR_LENGTH; @@ -929,7 +929,7 @@ void GetHTCSendPackets(HTC_TARGET *target, break; } - AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Got packet:%p , New Queue Depth: %d\n", + AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Got packet:%pK , New Queue Depth: %d\n", pPacket, HTC_PACKET_QUEUE_DEPTH(pTxQueue))); /* For non-credit path the sequence number is already embedded * in the constructed HTC header @@ -976,7 +976,7 @@ static HTC_SEND_QUEUE_RESULT HTCTrySend(HTC_TARGET *target, int overflow; HTC_SEND_QUEUE_RESULT result = HTC_SEND_QUEUE_OK; - AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+HTCTrySend (Queue:%p Depth:%d)\n", + AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+HTCTrySend (Queue:%pK Depth:%d)\n", pCallersSendQueue, (pCallersSendQueue == NULL) ? 0 : HTC_PACKET_QUEUE_DEPTH(pCallersSendQueue))); @@ -1038,7 +1038,7 @@ static HTC_SEND_QUEUE_RESULT HTCTrySend(HTC_TARGET *target, /* walk through the caller's queue and indicate each one to the send full handler */ ITERATE_OVER_LIST_ALLOW_REMOVE(&pCallersSendQueue->QueueHead, pPacket, HTC_PACKET, ListLink) { - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Indicating overflowed TX packet: %p \n", + AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Indicating overflowed TX packet: %pK \n", pPacket)); /* * Remove headroom reserved for HTC_FRAME_HDR before giving @@ -1205,7 +1205,7 @@ A_STATUS HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) adf_nbuf_t netbuf; HTC_FRAME_HDR *pHtcHdr; - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCSendPktsMultiple: Queue: %p, Pkts %d \n", + AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCSendPktsMultiple: Queue: %pK, Pkts %d \n", pPktQueue, HTC_PACKET_QUEUE_DEPTH(pPktQueue))); /* get packet at head to figure out which endpoint these packets will go into */ @@ -1299,7 +1299,7 @@ A_STATUS HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket) } a_mem_trace(GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket)); AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - ("+-HTCSendPkt: Enter endPointId: %d, buffer: %p, length: %d \n", + ("+-HTCSendPkt: Enter endPointId: %d, buffer: %pK, length: %d \n", pPacket->Endpoint, pPacket->pBuffer, pPacket->ActualLength)); INIT_HTC_PACKET_QUEUE_AND_ADD(&queue,pPacket); return HTCSendPktsMultiple(HTCHandle, &queue); diff --git a/CORE/SERVICES/HTC/htc_services.c b/CORE/SERVICES/HTC/htc_services.c index 4ee26eda9a4a..b72fedb4cba0 100644 --- a/CORE/SERVICES/HTC/htc_services.c +++ b/CORE/SERVICES/HTC/htc_services.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -59,7 +59,7 @@ A_STATUS HTCConnectService(HTC_HANDLE HTCHandle, A_UINT16 rsp_msg_id, rsp_msg_serv_id, rsp_msg_max_msg_size; A_UINT8 rsp_msg_status, rsp_msg_end_id, rsp_msg_serv_meta_len; - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCConnectService, target:%p SvcID:0x%X \n", + AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCConnectService, target:%pK SvcID:0x%X \n", target, pConnectReq->ServiceID)); do { diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 2d2a02c69626..0f825c7700f1 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -1147,7 +1147,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, wma->interfaces[resp_event->vdev_id].type, wma->interfaces[resp_event->vdev_id].sub_type); - WMA_LOGD("%s: Allocated beacon struct %p, template memory %p", + WMA_LOGD("%s: Allocated beacon struct %pK, template memory %pK", __func__, bcn, bcn->buf); } add_bss->status = VOS_STATUS_SUCCESS; @@ -2296,8 +2296,8 @@ static int wma_vdev_stop_ind(tp_wma_handle wma, u_int8_t *buf) bcn = wma->interfaces[resp_event->vdev_id].beacon; if (bcn) { - WMA_LOGD("%s: Freeing beacon struct %p, " - "template memory %p", __func__, + WMA_LOGD("%s: Freeing beacon struct %pK, " + "template memory %pK", __func__, bcn, bcn->buf); if (bcn->dma_mapped) adf_nbuf_unmap_single(pdev->osdev, bcn->buf, @@ -8753,7 +8753,7 @@ static int wma_antenna_isolation_event_handler(void *handle, WMI_COEX_REPORT_ANTENNA_ISOLATION_EVENTID_param_tlvs *param_buf; struct sir_isolation_resp isolation; tpAniSirGlobal mac = NULL; - WMA_LOGE("%s: handle %p param %p len %d", __func__, handle, param, len); + WMA_LOGE("%s: handle %pK param %pK len %d", __func__, handle, param, len); if(wma != NULL && wma->vos_context != NULL) { mac = (tpAniSirGlobal)vos_get_context( @@ -9848,7 +9848,7 @@ void wma_vdev_detach_callback(void *ctx) vos_get_global_context(VOS_MODULE_ID_WDA, NULL)); if (!wma || !iface->del_staself_req) { - WMA_LOGP("%s: wma %p iface %p", __func__, wma, + WMA_LOGP("%s: wma %pK iface %pK", __func__, wma, iface->del_staself_req); return; } @@ -9951,7 +9951,7 @@ static VOS_STATUS wma_vdev_detach(tp_wma_handle wma_handle, } - WMA_LOGD("vdev_id:%hu vdev_hdl:%p", vdev_id, iface->handle); + WMA_LOGD("vdev_id:%hu vdev_hdl:%pK", vdev_id, iface->handle); if (!generateRsp) { WMA_LOGE("Call txrx detach w/o callback for vdev %d", vdev_id); ol_txrx_vdev_detach(iface->handle, NULL, NULL); @@ -10127,8 +10127,8 @@ static void wma_set_sta_keep_alive(tp_wma_handle wma, u_int8_t vdev_id, if ((NULL == hostv4addr) || (NULL == destv4addr) || (NULL == destmac)) { - WMA_LOGE("%s: received null pointer, hostv4addr:%p " - "destv4addr:%p destmac:%p ", __func__, + WMA_LOGE("%s: received null pointer, hostv4addr:%pK " + "destv4addr:%pK destmac:%pK ", __func__, hostv4addr, destv4addr, destmac); wmi_buf_free(buf); return; @@ -10690,7 +10690,7 @@ static ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, txrx_vdev_type); wma_handle->interfaces[self_sta_req->sessionId].pause_bitmap = 0; - WMA_LOGD("vdev_id %hu, txrx_vdev_handle = %p", self_sta_req->sessionId, + WMA_LOGD("vdev_id %hu, txrx_vdev_handle = %pK", self_sta_req->sessionId, txrx_vdev_handle); if (NULL == txrx_vdev_handle) { @@ -14879,8 +14879,8 @@ void wma_vdev_resp_timer(void *data) bcn = wma->interfaces[tgt_req->vdev_id].beacon; if (bcn) { - WMA_LOGD("%s: Freeing beacon struct %p, " - "template memory %p", __func__, + WMA_LOGD("%s: Freeing beacon struct %pK, " + "template memory %pK", __func__, bcn, bcn->buf); if (bcn->dma_mapped) adf_nbuf_unmap_single(pdev->osdev, bcn->buf, @@ -15269,7 +15269,7 @@ void wma_roam_preauth_ind(tp_wma_handle wma_handle, u_int8_t *buf) { vdev_id = wmi_event->vdev_id; if (vdev_id >= wma_handle->max_bssid) { - WMA_LOGE("%s: Invalid vdev_id %d wmi_event %p", __func__, + WMA_LOGE("%s: Invalid vdev_id %d wmi_event %pK", __func__, vdev_id, wmi_event); return; } @@ -21136,7 +21136,7 @@ static void wma_send_beacon(tp_wma_handle wma, tpSendbeaconParams bcn_info) if (bcn_info->p2pIeOffset) { p2p_ie = bcn_info->beacon + bcn_info->p2pIeOffset; - WMA_LOGI(" %s: p2pIe is present - vdev_id %hu, p2p_ie = %p, p2p ie len = %hu", + WMA_LOGI(" %s: p2pIe is present - vdev_id %hu, p2p_ie = %pK, p2p ie len = %hu", __func__, vdev_id, p2p_ie, p2p_ie[1]); if (wma_p2p_go_set_beacon_ie(wma, vdev_id, p2p_ie) < 0) { WMA_LOGE("%s : wmi_unified_bcn_tmpl_send Failed ", __func__); @@ -35387,7 +35387,7 @@ static int wma_ibss_peer_info_event_handler(void *handle, u_int8_t *data, /*sanity check*/ if ((num_peers > 32) || (NULL == peer_info)) { - WMA_LOGE("%s: Invalid event data from target num_peers %d peer_info %p", + WMA_LOGE("%s: Invalid event data from target num_peers %d peer_info %pK", __func__, num_peers, peer_info); status = 1; goto send_response; @@ -35461,7 +35461,7 @@ static int wma_fast_tx_fail_event_handler(void *handle, u_int8_t *data, } else { - WMA_LOGE("%s: HDD callback is %p", __func__, wma->hddTxFailCb); + WMA_LOGE("%s: HDD callback is %pK", __func__, wma->hddTxFailCb); } return 0; @@ -39763,7 +39763,7 @@ void WDA_TxAbort(v_U8_t vdev_id) iface = &wma->interfaces[vdev_id]; if (!iface->handle) { - WMA_LOGE("%s: Failed to get iface handle: %p", + WMA_LOGE("%s: Failed to get iface handle: %pK", __func__, iface->handle); return; } diff --git a/CORE/SERVICES/WMA/wma_dfs_interface.c b/CORE/SERVICES/WMA/wma_dfs_interface.c index 7cbd1670810f..61f161c821ab 100644 --- a/CORE/SERVICES/WMA/wma_dfs_interface.c +++ b/CORE/SERVICES/WMA/wma_dfs_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013,2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2013,2016-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -65,7 +65,7 @@ ol_if_dfs_attach(struct ieee80211com *ic, void *ptr, void *radar_info) { struct ath_dfs_caps *pCap = (struct ath_dfs_caps *) ptr; - adf_os_print("%s: called; ptr=%p, radar_info=%p\n", + adf_os_print("%s: called; ptr=%pK, radar_info=%pK\n", __func__, ptr, radar_info); pCap->ath_chip_is_bb_tlv = 1; |
