From 99cdc9aeff16759b4a76bfc8ba08a0977fe85dad Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 3 Sep 2020 10:27:10 -0700 Subject: [PATCH] qcacmn: umac: Remove redundant __func__ from the logs The logging macros implicitly takes care of embedding function name in the log, hence there is no need to include __func__ again. Getting rid of redundant __func__ reduces driver memory footprint. Change-Id: Ife4d1dbb9bfafa4381f1017e331ddef247c649c2 CRs-Fixed: 2774457 --- umac/cfr/dispatcher/src/wlan_cfr_tgt_api.c | 3 +-- umac/dfs/core/src/filtering/dfs_process_phyerr.c | 8 +++----- .../core/src/filtering/dfs_process_radarevent.c | 15 +++++++-------- umac/dfs/core/src/filtering/dfs_radar.c | 9 ++++----- .../core/src/misc/dfs_process_radar_found_ind.c | 3 +-- .../lmac_if/src/wlan_lmac_if.c | 2 +- 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/umac/cfr/dispatcher/src/wlan_cfr_tgt_api.c b/umac/cfr/dispatcher/src/wlan_cfr_tgt_api.c index 8f26d66de312..def568110f54 100644 --- a/umac/cfr/dispatcher/src/wlan_cfr_tgt_api.c +++ b/umac/cfr/dispatcher/src/wlan_cfr_tgt_api.c @@ -69,8 +69,7 @@ void tgt_cfr_support_set(struct wlan_objmgr_psoc *psoc, uint32_t value) return; cfr_sc->is_cfr_capable = !!value; - cfr_debug("CFR:%s FW support advert=%d\n", __func__, - cfr_sc->is_cfr_capable); + cfr_debug("CFR: FW support advert=%d", cfr_sc->is_cfr_capable); } static inline struct wlan_lmac_if_cfr_tx_ops * diff --git a/umac/dfs/core/src/filtering/dfs_process_phyerr.c b/umac/dfs/core/src/filtering/dfs_process_phyerr.c index 4dee95054822..efe467a4a7be 100644 --- a/umac/dfs/core/src/filtering/dfs_process_phyerr.c +++ b/umac/dfs/core/src/filtering/dfs_process_phyerr.c @@ -925,8 +925,7 @@ void dfs_process_phyerr_filter_offload(struct wlan_dfs *dfs, if (!event) { WLAN_DFSEVENTQ_UNLOCK(dfs); dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, - "%s: No more space left for queuing DFS Phyerror events", - __func__); + "No more space left for queuing DFS Phyerror events"); return; } STAILQ_REMOVE_HEAD(&(dfs->dfs_eventq), re_list); @@ -969,11 +968,10 @@ void dfs_process_phyerr_filter_offload(struct wlan_dfs *dfs, } else { if (dfs->dfs_extchan_radindex == -1) dfs_debug(dfs, WLAN_DEBUG_DFS1, - "%s phyerr on ext channel", __func__); + "phyerr on ext channel"); event->re_chanindex = (uint8_t) dfs->dfs_extchan_radindex; dfs_debug(dfs, WLAN_DEBUG_DFS1, - "%s:New extension channel event is added to queue", - __func__); + "New extension channel event is added to queue"); } WLAN_DFSQ_LOCK(dfs); diff --git a/umac/dfs/core/src/filtering/dfs_process_radarevent.c b/umac/dfs/core/src/filtering/dfs_process_radarevent.c index bbb75d8cddc3..179b3b04c245 100644 --- a/umac/dfs/core/src/filtering/dfs_process_radarevent.c +++ b/umac/dfs/core/src/filtering/dfs_process_radarevent.c @@ -250,9 +250,7 @@ static bool dfs_is_real_radar(struct wlan_dfs *dfs, if (dfs->dfs_debug_mask & WLAN_DEBUG_DFS2) { dfs_print_delayline(dfs, &rf->rf_dl); - /* print pulse line */ - dfs_debug(dfs, WLAN_DEBUG_DFS2, - "%s: Pulse Line\n", __func__); + dfs_debug(dfs, WLAN_DEBUG_DFS2, "Pulse Line"); for (i = 0; i < pl->pl_numelems; i++) { index = (pl->pl_firstelem + i) & DFS_MAX_PULSE_BUFFER_MASK; @@ -280,9 +278,9 @@ static bool dfs_is_real_radar(struct wlan_dfs *dfs, } dfs_debug(dfs, WLAN_DEBUG_DFS2, - "%s: target_ts=%llu, dl_seq_num_start=%d, dl_seq_num_second=%d, dl_seq_num_stop=%d\n", - __func__, target_ts, dl->dl_seq_num_start, - dl->dl_seq_num_second, dl->dl_seq_num_stop); + "target_ts=%llu, dl_seq_num_start=%d, dl_seq_num_second=%d, dl_seq_num_stop=%d", + target_ts, dl->dl_seq_num_start, + dl->dl_seq_num_second, dl->dl_seq_num_stop); current_index = start_index; while (pl->pl_elems[current_index].p_seq_num < dl->dl_seq_num_stop) { @@ -357,8 +355,9 @@ static bool dfs_is_real_radar(struct wlan_dfs *dfs, rf->rf_threshold); return 0; } - dfs_debug(dfs, WLAN_DEBUG_DFS_FALSE_DET, "%s : dl->dl_min_sidx: %d , dl->dl_max_sidx :%d", - __func__, dl->dl_min_sidx, dl->dl_max_sidx); + dfs_debug(dfs, WLAN_DEBUG_DFS_FALSE_DET, + "dl->dl_min_sidx: %d, dl->dl_max_sidx: %d", + dl->dl_min_sidx, dl->dl_max_sidx); dfs->dfs_freq_offset = DFS_SIDX_TO_FREQ_OFFSET((dl->dl_min_sidx + dl->dl_max_sidx) / 2); diff --git a/umac/dfs/core/src/filtering/dfs_radar.c b/umac/dfs/core/src/filtering/dfs_radar.c index fae38b0cd719..a48344cc546b 100644 --- a/umac/dfs/core/src/filtering/dfs_radar.c +++ b/umac/dfs/core/src/filtering/dfs_radar.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved. * Copyright (c) 2011, Atheros Communications Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -409,10 +409,9 @@ int dfs_set_thresholds(struct wlan_dfs *dfs, const uint32_t threshtype, chanindex = dfs->dfs_curchan_radindex; if ((chanindex < 0) || (chanindex >= DFS_NUM_RADAR_STATES)) { dfs_debug(dfs, WLAN_DEBUG_DFS1, - "%s: chanindex = %d, DFS_NUM_RADAR_STATES=%d\n", - __func__, - chanindex, - DFS_NUM_RADAR_STATES); + "chanindex = %d, DFS_NUM_RADAR_STATES=%d", + chanindex, + DFS_NUM_RADAR_STATES); return 0; } diff --git a/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c b/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c index 3e883f757bb8..4f71d003c0fc 100644 --- a/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c +++ b/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c @@ -1261,8 +1261,7 @@ dfs_process_radar_ind_on_home_chan(struct wlan_dfs *dfs, */ dfs_debug(dfs, WLAN_DEBUG_DFS, - "%s: %d Radar found on dfs detector:%d", - __func__, __LINE__, radar_found->detector_id); + "Radar found on dfs detector: %d", radar_found->detector_id); dfs_mark_precac_nol_for_freq(dfs, dfs->is_radar_found_on_secondary_seg, radar_found->detector_id, diff --git a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c index 6451d4bcb3c3..bb0a508bcc92 100644 --- a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c +++ b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c @@ -711,7 +711,7 @@ wlan_lmac_if_umac_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops) struct wlan_lmac_if_mgmt_txrx_rx_ops *mgmt_txrx_rx_ops; if (!rx_ops) { - qdf_print("%s: lmac if rx ops pointer is NULL", __func__); + qdf_print("lmac if rx ops pointer is NULL"); return QDF_STATUS_E_INVAL; }