diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2017-09-22 11:15:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-22 11:15:24 -0700 |
| commit | 9f935caef0cec7fa1cfd28d67e8a56f59bb9f28e (patch) | |
| tree | 699dc8988ca5e064d44cc48559982668cb94726c | |
| parent | 8cf9fbf9c84951528dae89b75c2fa3c39656233d (diff) | |
| parent | 8d87280a578985035a64ccb6466c2076e4ebac3a (diff) | |
Merge "qcacmn: qdf: Replace instances of unadorned %p" into wlan-cmn.driver.lnx.1.0
| -rw-r--r-- | qdf/linux/src/i_osdep.h | 2 | ||||
| -rw-r--r-- | qdf/linux/src/qdf_mem.c | 4 | ||||
| -rw-r--r-- | qdf/linux/src/qdf_nbuf.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/qdf/linux/src/i_osdep.h b/qdf/linux/src/i_osdep.h index 10b5ae01a7fa..30ffa66e00e1 100644 --- a/qdf/linux/src/i_osdep.h +++ b/qdf/linux/src/i_osdep.h @@ -66,7 +66,7 @@ typedef struct timer_list os_timer_t; 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/qdf/linux/src/qdf_mem.c b/qdf/linux/src/qdf_mem.c index c7e609a5ecc0..5d8c3ec34e53 100644 --- a/qdf/linux/src/qdf_mem.c +++ b/qdf/linux/src/qdf_mem.c @@ -1401,7 +1401,7 @@ void qdf_mem_copy(void *dst_addr, const void *src_addr, uint32_t num_bytes) if ((dst_addr == NULL) || (src_addr == NULL)) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s called with NULL parameter, source:%p destination:%p", + "%s called with NULL parameter, source:%pK destination:%pK", __func__, src_addr, dst_addr); QDF_ASSERT(0); return; @@ -1475,7 +1475,7 @@ void qdf_mem_move(void *dst_addr, const void *src_addr, uint32_t num_bytes) if ((dst_addr == NULL) || (src_addr == NULL)) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s called with NULL parameter, source:%p destination:%p", + "%s called with NULL parameter, source:%pK destination:%pK", __func__, src_addr, dst_addr); QDF_ASSERT(0); return; diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c index fdc666543984..53ca6a58948b 100644 --- a/qdf/linux/src/qdf_nbuf.c +++ b/qdf/linux/src/qdf_nbuf.c @@ -1718,7 +1718,7 @@ void qdf_net_buf_debug_add_node(qdf_nbuf_t net_buf, size_t size, p_node = qdf_net_buf_debug_look_up(net_buf); if (p_node) { - qdf_print("Double allocation of skb ! Already allocated from %p %s %d current alloc from %p %s %d", + qdf_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); qdf_nbuf_track_free(new_node); @@ -1788,7 +1788,7 @@ done: spin_unlock_irqrestore(&g_qdf_net_buf_track_lock[i], irq_flag); if (!found) { - qdf_print("Unallocated buffer ! Double free of net_buf %p ?", + qdf_print("Unallocated buffer ! Double free of net_buf %pK ?", net_buf); QDF_ASSERT(0); } else { @@ -2036,7 +2036,7 @@ static inline void __qdf_nbuf_fill_tso_cmn_seg_info( curr_seg->seg.total_len = curr_seg->seg.tso_frags[0].length; curr_seg->seg.tso_frags[0].paddr = tso_cmn_info->eit_hdr_dma_map_addr; - TSO_DEBUG("%s %d eit hdr %p eit_hdr_len %d tcp_seq_num %u tso_info->total_len %u\n", + TSO_DEBUG("%s %d eit hdr %pK eit_hdr_len %d tcp_seq_num %u tso_info->total_len %u\n", __func__, __LINE__, tso_cmn_info->eit_hdr, tso_cmn_info->eit_hdr_len, curr_seg->seg.tso_flags.tcp_seq_num, @@ -2139,7 +2139,7 @@ uint32_t __qdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, curr_seg->seg.tso_frags[i].paddr = tso_frag_paddr; TSO_DEBUG("%s[%d] frag %d frag len %d " - "total_len %u vaddr %p\n", + "total_len %u vaddr %pK\n", __func__, __LINE__, i, tso_frag_len, |