From 8104b5db07594a7477da889aeab3674593e48cf6 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 18 Sep 2017 10:05:59 -0700 Subject: [PATCH] qcacmn: utils: Replace instances of unadorned %p Replace instances of unadorned %p in utils. Change-Id: Idd12720d45238adad17ffafa6dfb50041022cbe2 CRs-Fixed: 2111274 --- utils/epping/src/epping_rx.c | 2 +- utils/epping/src/epping_tx.c | 14 +++++++------- utils/epping/src/epping_txrx.c | 2 +- utils/logging/src/wlan_logging_sock_svc.c | 6 +++--- utils/nlink/src/wlan_nlink_srv.c | 4 ++-- utils/ptt/src/wlan_ptt_sock_svc.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/utils/epping/src/epping_rx.c b/utils/epping/src/epping_rx.c index 19c4c0cc53..4cd18ca3e7 100644 --- a/utils/epping/src/epping_rx.c +++ b/utils/epping/src/epping_rx.c @@ -117,7 +117,7 @@ void epping_rx(void *ctx, HTC_PACKET *pPacket) struct sk_buff *pktSkb = (struct sk_buff *)pPacket->pPktContext; EPPING_LOG(QDF_TRACE_LEVEL_INFO, - "%s: adapter = 0x%p eid=%d, skb=0x%p, data=0x%p, len=0x%x status:%d", + "%s: adapter = 0x%pK eid=%d, skb=0x%pK, data=0x%pK, len=0x%x status:%d", __func__, adapter, eid, pktSkb, pPacket->pBuffer, pPacket->ActualLength, status); diff --git a/utils/epping/src/epping_tx.c b/utils/epping/src/epping_tx.c index 1a1b683b74..49e701163f 100644 --- a/utils/epping/src/epping_tx.c +++ b/utils/epping/src/epping_tx.c @@ -186,7 +186,7 @@ void epping_tx_timer_expire(epping_adapter_t *adapter) htc_set_nodrop_pkt(adapter->pEpping_ctx->HTCHandle, true); if (epping_tx_send_int(nodrop_skb, adapter)) { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, - "%s: nodrop: %p xmit fail in timer\n", + "%s: nodrop: %pK xmit fail in timer\n", __func__, nodrop_skb); /* fail to xmit so put the nodrop packet to the nodrop queue */ qdf_nbuf_queue_insert_head(&adapter->nodrop_queue, @@ -195,7 +195,7 @@ void epping_tx_timer_expire(epping_adapter_t *adapter) } else { htc_set_nodrop_pkt(adapter->pEpping_ctx->HTCHandle, false); EPPING_LOG(QDF_TRACE_LEVEL_INFO, - "%s: nodrop: %p xmit ok in timer\n", + "%s: nodrop: %pK xmit ok in timer\n", __func__, nodrop_skb); } } @@ -258,7 +258,7 @@ int epping_tx_send(qdf_nbuf_t skb, epping_adapter_t *adapter) htc_set_nodrop_pkt(adapter->pEpping_ctx->HTCHandle, true); if (epping_tx_send_int(nodrop_skb, adapter)) { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, - "%s: nodrop: %p xmit fail\n", __func__, + "%s: nodrop: %pK xmit fail\n", __func__, nodrop_skb); /* fail to xmit so put the nodrop packet to the nodrop queue */ qdf_nbuf_queue_insert_head(&adapter->nodrop_queue, @@ -268,7 +268,7 @@ int epping_tx_send(qdf_nbuf_t skb, epping_adapter_t *adapter) } else { htc_set_nodrop_pkt(adapter->pEpping_ctx->HTCHandle, false); EPPING_LOG(QDF_TRACE_LEVEL_INFO, - "%s: nodrop: %p xmit ok\n", __func__, + "%s: nodrop: %pK xmit ok\n", __func__, nodrop_skb); } } @@ -285,12 +285,12 @@ tx_fail: qdf_nbuf_free(skb); ++adapter->stats.tx_dropped; EPPING_LOG(QDF_TRACE_LEVEL_FATAL, - "%s: Tx skb %p dropped, stats.tx_dropped = %ld\n", + "%s: Tx skb %pK dropped, stats.tx_dropped = %ld\n", __func__, skb, adapter->stats.tx_dropped); return -ENOMEM; } else { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, - "%s: nodrop: %p queued\n", __func__, skb); + "%s: nodrop: %pK queued\n", __func__, skb); qdf_nbuf_queue_add(&adapter->nodrop_queue, skb); qdf_spin_lock_bh(&adapter->data_lock); if (adapter->epping_timer_state != EPPING_TX_TIMER_RUNNING) { @@ -367,7 +367,7 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue) } EPPING_LOG(QDF_TRACE_LEVEL_INFO, - "%s skb=%p data=%p len=0x%x eid=%d ", + "%s skb=%pK data=%pK len=0x%x eid=%d ", __func__, pktSkb, htc_pkt->pBuffer, htc_pkt->ActualLength, eid); diff --git a/utils/epping/src/epping_txrx.c b/utils/epping/src/epping_txrx.c index 78206115f9..bb3d49547c 100644 --- a/utils/epping/src/epping_txrx.c +++ b/utils/epping/src/epping_txrx.c @@ -269,7 +269,7 @@ static int epping_start_adapter(epping_adapter_t *adapter) adapter->started = true; } else { EPPING_LOG(QDF_TRACE_LEVEL_WARN, - "%s: adapter %p already started\n", __func__, + "%s: adapter %pK already started\n", __func__, adapter); } return 0; diff --git a/utils/logging/src/wlan_logging_sock_svc.c b/utils/logging/src/wlan_logging_sock_svc.c index ddfc6dccb1..d522ab4ddd 100644 --- a/utils/logging/src/wlan_logging_sock_svc.c +++ b/utils/logging/src/wlan_logging_sock_svc.c @@ -449,7 +449,7 @@ static int pkt_stats_fill_headers(struct sk_buff *skb) #endif if (unlikely(skb_headroom(skb) < cds_pkt_size)) { - pr_err("VPKT [%d]: Insufficient headroom, head[%p], data[%p], req[%zu]", + pr_err("VPKT [%d]: Insufficient headroom, head[%pK], data[%pK], req[%zu]", __LINE__, skb->head, skb->data, sizeof(msg_header)); return -EIO; } @@ -458,7 +458,7 @@ static int pkt_stats_fill_headers(struct sk_buff *skb) &cds_pktlog, cds_pkt_size); if (unlikely(skb_headroom(skb) < sizeof(int))) { - pr_err("VPKT [%d]: Insufficient headroom, head[%p], data[%p], req[%zu]", + pr_err("VPKT [%d]: Insufficient headroom, head[%pK], data[%pK], req[%zu]", __LINE__, skb->head, skb->data, sizeof(int)); return -EIO; } @@ -480,7 +480,7 @@ static int pkt_stats_fill_headers(struct sk_buff *skb) msg_header.wmsg.length = cpu_to_be16(skb->len); if (unlikely(skb_headroom(skb) < sizeof(msg_header))) { - pr_err("VPKT [%d]: Insufficient headroom, head[%p], data[%p], req[%zu]", + pr_err("VPKT [%d]: Insufficient headroom, head[%pK], data[%pK], req[%zu]", __LINE__, skb->head, skb->data, sizeof(msg_header)); return -EIO; } diff --git a/utils/nlink/src/wlan_nlink_srv.c b/utils/nlink/src/wlan_nlink_srv.c index 2c7d56a946..197e7ece53 100644 --- a/utils/nlink/src/wlan_nlink_srv.c +++ b/utils/nlink/src/wlan_nlink_srv.c @@ -75,7 +75,7 @@ int nl_srv_init(void *wiphy) wiphy_ptr = wiphy; radio_idx = cnss_logger_device_register(wiphy, THIS_MODULE->name); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: radio_index: %d, wiphy_ptr: %p", + "%s: radio_index: %d, wiphy_ptr: %pK", __func__, radio_idx, wiphy_ptr); if (radio_idx >= 0) @@ -629,7 +629,7 @@ static void nl_srv_rcv_skb(struct sk_buff *skb) if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: Invalid " - "Netlink message: skb[%p], len[%d], nlhdr[%p], nlmsg_len[%d]", + "Netlink message: skb[%pK], len[%d], nlhdr[%pK], nlmsg_len[%d]", skb, skb->len, nlh, nlh->nlmsg_len); return; } diff --git a/utils/ptt/src/wlan_ptt_sock_svc.c b/utils/ptt/src/wlan_ptt_sock_svc.c index 35f296002b..593402ce34 100644 --- a/utils/ptt/src/wlan_ptt_sock_svc.c +++ b/utils/ptt/src/wlan_ptt_sock_svc.c @@ -62,7 +62,7 @@ static void ptt_sock_dump_buf(const unsigned char *pbuf, int cnt) for (i = 0; i < cnt; i++) { if ((i % 16) == 0) QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, - "\n%p:", pbuf); + "\n%pK:", pbuf); QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, " %02X", *pbuf); pbuf++;