diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c index 2acef7d15564..5dd65648d719 100644 --- a/dp/wifi3.0/dp_htt.c +++ b/dp/wifi3.0/dp_htt.c @@ -946,7 +946,7 @@ int htt_srng_setup(struct htt_soc *soc, int mac_id, else HTT_SRING_SETUP_PDEV_ID_SET(*msg_word, mac_id); - dp_info("%s: mac_id %d", __func__, mac_id); + dp_info("mac_id %d", mac_id); HTT_SRING_SETUP_RING_TYPE_SET(*msg_word, htt_ring_type); /* TODO: Discuss with FW on changing this to unique ID and using * htt_ring_type to send the type of ring @@ -971,10 +971,9 @@ int htt_srng_setup(struct htt_soc *soc, int mac_id, HTT_SRING_SETUP_ENTRY_SIZE_SET(*msg_word, ring_entry_size); HTT_SRING_SETUP_RING_SIZE_SET(*msg_word, (ring_entry_size * srng_params.num_entries)); - dp_info("%s: entry_size %d", __func__, ring_entry_size); - dp_info("%s: num_entries %d", __func__, srng_params.num_entries); - dp_info("%s: ring_size %d", __func__, - (ring_entry_size * srng_params.num_entries)); + dp_info("entry_size %d", ring_entry_size); + dp_info("num_entries %d", srng_params.num_entries); + dp_info("ring_size %d", (ring_entry_size * srng_params.num_entries)); if (htt_ring_type == HTT_SW_TO_HW_RING) HTT_SRING_SETUP_RING_MISC_CFG_FLAG_LOOPCOUNT_DISABLE_SET( *msg_word, 1); diff --git a/dp/wifi3.0/dp_ipa.c b/dp/wifi3.0/dp_ipa.c index 884ab66fd1ca..eba52f2fb0b4 100644 --- a/dp/wifi3.0/dp_ipa.c +++ b/dp/wifi3.0/dp_ipa.c @@ -699,7 +699,7 @@ QDF_STATUS dp_ipa_get_resource(struct cdp_soc_t *soc_hdl, uint8_t pdev_id) struct dp_ipa_resources *ipa_res; if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -756,7 +756,7 @@ QDF_STATUS dp_ipa_set_doorbell_paddr(struct cdp_soc_t *soc_hdl, uint8_t pdev_id) uint32_t rx_ready_doorbell_dmaaddr; if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -802,7 +802,7 @@ QDF_STATUS dp_ipa_op_response(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, dp_get_pdev_from_soc_pdev_id_wifi3(soc, pdev_id); if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -830,7 +830,7 @@ QDF_STATUS dp_ipa_register_op_cb(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, dp_get_pdev_from_soc_pdev_id_wifi3(soc, pdev_id); if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -883,7 +883,7 @@ QDF_STATUS dp_ipa_enable_autonomy(struct cdp_soc_t *soc_hdl, uint8_t pdev_id) uint32_t ix2; if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -935,7 +935,7 @@ QDF_STATUS dp_ipa_disable_autonomy(struct cdp_soc_t *soc_hdl, uint8_t pdev_id) uint32_t ix3; if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -1213,7 +1213,7 @@ QDF_STATUS dp_ipa_setup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, int ret; if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -1408,7 +1408,7 @@ QDF_STATUS dp_ipa_setup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, int ret; if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -1694,7 +1694,7 @@ QDF_STATUS dp_ipa_enable_pipes(struct cdp_soc_t *soc_hdl, uint8_t pdev_id) QDF_STATUS result; if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } @@ -1729,7 +1729,7 @@ QDF_STATUS dp_ipa_disable_pipes(struct cdp_soc_t *soc_hdl, uint8_t pdev_id) QDF_STATUS result; if (!pdev) { - dp_err("%s invalid instance", __func__); + dp_err("Invalid instance"); return QDF_STATUS_E_FAILURE; } diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 68013292ee33..193d61ad1bea 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -6363,7 +6363,7 @@ dp_record_mscs_params(struct cdp_soc_t *soc_hdl, uint8_t *peer_mac, DP_MOD_ID_CDP); if (!peer) { - dp_err("%s: Peer is NULL!\n", __func__); + dp_err("Peer is NULL!"); goto fail; } if (!active) { @@ -9561,7 +9561,7 @@ QDF_STATUS dp_txrx_clear_dump_stats(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, QDF_STATUS status = QDF_STATUS_SUCCESS; if (!soc) { - dp_err("%s: soc is NULL", __func__); + dp_err("soc is NULL"); return QDF_STATUS_E_INVAL; } diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index e8fccd760675..c29225aac912 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -2659,8 +2659,7 @@ void dp_rx_tid_delete_cb(struct dp_soc *soc, void *cb_ctxt, } else if (reo_status->rx_queue_status.header.status != HAL_REO_CMD_SUCCESS) { /* Should not happen normally. Just print error for now */ - dp_info_rl("%s: Rx tid HW desc deletion failed(%d): tid %d", - __func__, + dp_info_rl("Rx tid HW desc deletion failed(%d): tid %d", reo_status->rx_queue_status.header.status, freedesc->rx_tid.tid); } @@ -2767,8 +2766,8 @@ void dp_rx_tid_delete_cb(struct dp_soc *soc, void *cb_ctxt, * In case of MCL path add the desc back to the free * desc list and defer deletion. */ - dp_info_rl("%s: fail to send REO cmd to flush cache: tid %d", - __func__, rx_tid->tid); + dp_info_rl("fail to send REO cmd to flush cache: tid %d", + rx_tid->tid); dp_reo_desc_clean_up(soc, desc, &reo_status); DP_STATS_INC(soc, rx.err.reo_cmd_send_fail, 1); break; @@ -3129,11 +3128,11 @@ int dp_addba_resp_tx_completion_wifi3(struct cdp_soc_t *cdp_soc, if (dp_rx_tid_update_wifi3(peer, tid, rx_tid->ba_win_size, rx_tid->startseqnum)) { - dp_err("%s: failed update REO SSN", __func__); + dp_err("Failed update REO SSN"); } - dp_info("%s: tid %u window_size %u start_seq_num %u", - __func__, tid, rx_tid->ba_win_size, + dp_info("tid %u window_size %u start_seq_num %u", + tid, rx_tid->ba_win_size, rx_tid->startseqnum); /* First Session */ @@ -4169,8 +4168,8 @@ bool dp_find_peer_exist_on_other_vdev(struct cdp_soc_t *soc_hdl, peer = dp_peer_find_hash_find(soc, peer_addr, 0, i, DP_MOD_ID_CDP); if (peer) { - dp_err("%s: Duplicate peer "QDF_MAC_ADDR_FMT" already exist on vdev %d", - __func__, QDF_MAC_ADDR_REF(peer_addr), i); + dp_err("Duplicate peer "QDF_MAC_ADDR_FMT" already exist on vdev %d", + QDF_MAC_ADDR_REF(peer_addr), i); dp_peer_unref_delete(peer, DP_MOD_ID_CDP); return true; } diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c index ef070f777cbc..0d3d70d60dde 100644 --- a/dp/wifi3.0/dp_rx_defrag.c +++ b/dp/wifi3.0/dp_rx_defrag.c @@ -774,7 +774,7 @@ static QDF_STATUS dp_rx_defrag_tkip_demic(const uint8_t *key, while (next) { pktlen += (qdf_nbuf_len(next) - hdrlen); prev = next; - dp_debug("%s pktlen %u", __func__, + dp_debug("pktlen %u", (uint32_t)(qdf_nbuf_len(next) - hdrlen)); next = qdf_nbuf_next(next); } @@ -1033,7 +1033,7 @@ dp_rx_defrag_nwifi_to_8023(struct dp_soc *soc, struct dp_peer *peer, int tid, rx_desc_info)) fc = hal_rx_get_frame_ctrl_field(rx_desc_info); - dp_debug("%s: frame control type: 0x%x", __func__, fc); + dp_debug("Frame control type: 0x%x", fc); switch (((fc & 0xff00) >> 8) & IEEE80211_FC1_DIR_MASK) { case IEEE80211_FC1_DIR_NODS: diff --git a/dp/wifi3.0/dp_rx_mon_dest.c b/dp/wifi3.0/dp_rx_mon_dest.c index e941de789a2d..ae310e3573ae 100644 --- a/dp/wifi3.0/dp_rx_mon_dest.c +++ b/dp/wifi3.0/dp_rx_mon_dest.c @@ -1644,8 +1644,7 @@ dp_rx_pdev_mon_cmn_buffers_alloc(struct dp_pdev *pdev, int mac_id) mac_for_pdev = dp_get_lmac_id_for_pdev_id(pdev->soc, mac_id, pdev_id); status = dp_rx_pdev_mon_status_buffers_alloc(pdev, mac_for_pdev); if (!QDF_IS_STATUS_SUCCESS(status)) { - dp_err("%s: dp_rx_pdev_mon_status_desc_pool_alloc() failed", - __func__); + dp_err("dp_rx_pdev_mon_status_desc_pool_alloc() failed"); goto fail; } @@ -1655,8 +1654,7 @@ dp_rx_pdev_mon_cmn_buffers_alloc(struct dp_pdev *pdev, int mac_id) status = dp_rx_pdev_mon_buf_buffers_alloc(pdev, mac_for_pdev, delayed_replenish); if (!QDF_IS_STATUS_SUCCESS(status)) { - dp_err("%s: dp_rx_pdev_mon_buf_desc_pool_alloc() failed\n", - __func__); + dp_err("dp_rx_pdev_mon_buf_desc_pool_alloc() failed"); goto mon_stat_buf_dealloc; } @@ -1836,8 +1834,7 @@ dp_rx_pdev_mon_cmn_desc_pool_alloc(struct dp_pdev *pdev, int mac_id) /* Allocate sw rx descriptor pool for monitor status ring */ status = dp_rx_pdev_mon_status_desc_pool_alloc(pdev, mac_for_pdev); if (!QDF_IS_STATUS_SUCCESS(status)) { - dp_err("%s: dp_rx_pdev_mon_status_desc_pool_alloc() failed", - __func__); + dp_err("dp_rx_pdev_mon_status_desc_pool_alloc() failed"); goto fail; } @@ -1847,16 +1844,14 @@ dp_rx_pdev_mon_cmn_desc_pool_alloc(struct dp_pdev *pdev, int mac_id) /* Allocate sw rx descriptor pool for monitor RxDMA buffer ring */ status = dp_rx_pdev_mon_buf_desc_pool_alloc(pdev, mac_for_pdev); if (!QDF_IS_STATUS_SUCCESS(status)) { - dp_err("%s: dp_rx_pdev_mon_buf_desc_pool_alloc() failed\n", - __func__); + dp_err("dp_rx_pdev_mon_buf_desc_pool_alloc() failed"); goto mon_status_dealloc; } /* Allocate link descriptors for the monitor link descriptor ring */ status = dp_hw_link_desc_pool_banks_alloc(soc, mac_for_pdev); if (!QDF_IS_STATUS_SUCCESS(status)) { - dp_err("%s: dp_hw_link_desc_pool_banks_alloc() failed", - __func__); + dp_err("dp_hw_link_desc_pool_banks_alloc() failed"); goto mon_buf_dealloc; } return status;