From 3ab152450defe0af85b54ae7f35da2281f4964d1 Mon Sep 17 00:00:00 2001 From: Chaithanya Garrepalli Date: Tue, 29 Dec 2020 14:07:53 +0530 Subject: [PATCH] qcacmn: fix print format compilation errors Fix print format compilation errors and remove no-format compilation flag Change-Id: I69cd0c2eedaa4f2b4189275bf639f48a2fa6b80b --- dp/wifi3.0/dp_htt.c | 4 ++-- dp/wifi3.0/dp_mon_filter.c | 4 ++-- dp/wifi3.0/dp_peer.c | 4 ++-- dp/wifi3.0/dp_rx_mon_dest.c | 4 ++-- dp/wifi3.0/dp_rx_mon_status.c | 6 ++---- dp/wifi3.0/dp_tx.c | 4 ++-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c index e070ffaf49..b2f9a5cd7b 100644 --- a/dp/wifi3.0/dp_htt.c +++ b/dp/wifi3.0/dp_htt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -3285,7 +3285,7 @@ dp_process_ppdu_stats_tx_mgmtctrl_payload_tlv(struct dp_pdev *pdev, if (pdev->tx_capture_enabled) { head_size = sizeof(struct cdp_tx_mgmt_comp_info); if (qdf_unlikely(qdf_nbuf_headroom(tag_buf) < head_size)) { - qdf_err("Fail to get headroom h_sz %d h_avail %d\n", + qdf_err("Fail to get headroom h_sz %zu h_avail %d\n", head_size, qdf_nbuf_headroom(tag_buf)); qdf_assert_always(0); return QDF_STATUS_E_NOMEM; diff --git a/dp/wifi3.0/dp_mon_filter.c b/dp/wifi3.0/dp_mon_filter.c index 63ee908c6b..4f21596b31 100644 --- a/dp/wifi3.0/dp_mon_filter.c +++ b/dp/wifi3.0/dp_mon_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -386,7 +386,7 @@ static QDF_STATUS dp_mon_filter_check_co_exist(struct dp_pdev *pdev) if (pdev->mcopy_mode && (pdev->monitor_vdev || pdev->neighbour_peers_added)) { dp_mon_filter_err("%pK: mcopy mode can't exist with modes\n" - "Monitor Mode:%d\n" + "Monitor Mode:%pK\n" "Smart Monitor Mode:%d", pdev->soc, pdev->monitor_vdev, pdev->neighbour_peers_added); diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index 994f452ad3..006211a24c 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -3714,7 +3714,7 @@ QDF_STATUS dp_peer_ext_stats_ctx_alloc(struct dp_soc *soc, uint8_t tid, ctx_id; if (!soc || !peer) { - dp_warn("Null soc%x or peer%x", soc, peer); + dp_warn("Null soc%pK or peer%pK", soc, peer); return QDF_STATUS_E_INVAL; } diff --git a/dp/wifi3.0/dp_rx_mon_dest.c b/dp/wifi3.0/dp_rx_mon_dest.c index aa5243238f..ae0a7ade5f 100644 --- a/dp/wifi3.0/dp_rx_mon_dest.c +++ b/dp/wifi3.0/dp_rx_mon_dest.c @@ -1233,7 +1233,7 @@ void dp_rx_mon_update_pf_tag_to_buf_headroom(struct dp_soc *soc, /* Headroom must be double of PF_TAG_SIZE as we copy it 1stly to head */ if (qdf_unlikely(qdf_nbuf_headroom(nbuf) < (DP_RX_MON_TOT_PF_TAG_LEN * 2))) { - dp_err("Nbuf avail Headroom[%d] < 2 * DP_RX_MON_PF_TAG_TOT_LEN[%d]", + dp_err("Nbuf avail Headroom[%d] < 2 * DP_RX_MON_PF_TAG_TOT_LEN[%lu]", qdf_nbuf_headroom(nbuf), DP_RX_MON_TOT_PF_TAG_LEN); return; } @@ -1247,7 +1247,7 @@ void dp_rx_mon_update_pf_tag_to_buf_headroom(struct dp_soc *soc, while (ext_list) { /* Headroom must be double of PF_TAG_SIZE as we copy it 1stly to head */ if (qdf_unlikely(qdf_nbuf_headroom(ext_list) < (DP_RX_MON_TOT_PF_TAG_LEN * 2))) { - dp_err("Fraglist Nbuf avail Headroom[%d] < 2 * DP_RX_MON_PF_TAG_TOT_LEN[%d]", + dp_err("Fraglist Nbuf avail Headroom[%d] < 2 * DP_RX_MON_PF_TAG_TOT_LEN[%lu]", qdf_nbuf_headroom(ext_list), DP_RX_MON_TOT_PF_TAG_LEN); ext_list = qdf_nbuf_queue_next(ext_list); continue; diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c index 8be1b061a5..3d7d5a20fd 100644 --- a/dp/wifi3.0/dp_rx_mon_status.c +++ b/dp/wifi3.0/dp_rx_mon_status.c @@ -897,8 +897,7 @@ dp_rx_mcopy_handle_last_mpdu(struct dp_soc *soc, struct dp_pdev *pdev, if (!nbuf_clone) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Failed to clone nbuf", - __func__, __LINE__); + "Failed to clone nbuf"); goto end1; } @@ -1025,8 +1024,7 @@ dp_rx_process_mcopy_mode(struct dp_soc *soc, struct dp_pdev *pdev, nbuf_clone = qdf_nbuf_clone(status_nbuf); if (!nbuf_clone) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Failed to clone nbuf", - __func__, __LINE__); + "Failed to clone nbuf"); goto end; } diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 216ee7639c..d9f646abf9 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -3362,7 +3362,7 @@ void dp_tx_comp_fill_tx_completion_stats(struct dp_tx_desc_s *tx_desc, } if (qdf_nbuf_push_head(netbuf, sizeof(struct meta_hdr_s)) == NULL) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "netbuf %pK offset %lu", netbuf, + "netbuf %pK offset %zu", netbuf, sizeof(struct meta_hdr_s)); return; }