From 87b638fadb96804cb9fcde2489bc32959aaa45a5 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Tue, 1 Sep 2020 22:20:21 -0700 Subject: [PATCH] qcacld-3.0: 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: Idf4685539991f65205f19b27551cef699230c82e CRs-Fixed: 2768575 --- .../src/wlan_policy_mgr_get_set_utils.c | 7 ++-- components/ocb/core/src/wlan_ocb_main.c | 10 +++--- .../pmo/core/src/wlan_pmo_static_config.c | 4 +-- .../target_if/disa/src/target_if_disa.c | 4 +-- .../src/target_if_ftm_time_sync.c | 4 +-- core/cds/src/cds_api.c | 12 +++---- core/hdd/src/wlan_hdd_assoc.c | 2 +- core/hdd/src/wlan_hdd_cfg80211.c | 17 ++++------ core/hdd/src/wlan_hdd_main.c | 6 ++-- core/hdd/src/wlan_hdd_napi.c | 12 +++---- core/hdd/src/wlan_hdd_regulatory.c | 5 ++- core/hdd/src/wlan_hdd_stats.c | 2 +- core/mac/src/pe/lim/lim_api.c | 2 +- core/mac/src/pe/lim/lim_ft.c | 2 +- core/sme/src/csr/csr_api_roam.c | 10 +++--- core/wma/src/wma_features.c | 4 +-- core/wma/src/wma_scan_roam.c | 33 +++++++++---------- core/wma/src/wma_utils.c | 6 ++-- 18 files changed, 68 insertions(+), 74 deletions(-) diff --git a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c index 2c0ded179e1a..03639bd7b13c 100644 --- a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c +++ b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c @@ -2753,8 +2753,7 @@ uint32_t policy_mgr_search_and_check_for_session_conc( status = policy_mgr_get_channel_from_scan_result( psoc, roam_profile, &ch_freq, session_id); if (QDF_STATUS_SUCCESS != status || ch_freq == 0) { - policy_mgr_err("%s error %d %d", - __func__, status, ch_freq); + policy_mgr_err("status: %d ch_freq: %d", status, ch_freq); return 0; } @@ -3794,8 +3793,8 @@ QDF_STATUS policy_mgr_get_updated_scan_and_fw_mode_config( WMI_DBS_CONC_SCAN_CFG_ASYNC_DBS_SCAN_SET(*scan_config, 0); break; case ENABLE_DBS_CXN_AND_DISABLE_DBS_SCAN: - policy_mgr_debug("%s: dual_mac_disable_ini:%d ", __func__, - dual_mac_disable_ini); + policy_mgr_debug("dual_mac_disable_ini:%d ", + dual_mac_disable_ini); WMI_DBS_CONC_SCAN_CFG_DBS_SCAN_SET(*scan_config, 0); break; default: diff --git a/components/ocb/core/src/wlan_ocb_main.c b/components/ocb/core/src/wlan_ocb_main.c index bca6ff0adcb2..4e952d8c574c 100644 --- a/components/ocb/core/src/wlan_ocb_main.c +++ b/components/ocb/core/src/wlan_ocb_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2020 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 @@ -211,7 +211,7 @@ static QDF_STATUS ocb_tsf_timer(struct ocb_rx_event *evt) ocb_debug("TSF timer low=%d, high=%d", tsf_timer->timer_low, tsf_timer->timer_high); if (cbs && cbs->ocb_get_tsf_timer_callback) { - ocb_debug("%s: send TSF timer.", __func__); + ocb_debug("send TSF timer"); cbs->ocb_get_tsf_timer_callback(cbs->ocb_get_tsf_timer_context, tsf_timer); status = QDF_STATUS_SUCCESS; @@ -249,7 +249,7 @@ static QDF_STATUS ocb_dcc_stats_response(struct ocb_rx_event *evt) cbs = wlan_ocb_get_callbacks(pdev); dcc_stats = &event->rsp.dcc_stats; if (cbs && cbs->ocb_dcc_get_stats_callback) { - ocb_debug("%s: send DCC stats", __func__); + ocb_debug("send DCC stats"); cbs->ocb_dcc_get_stats_callback(cbs->ocb_dcc_get_stats_context, dcc_stats); status = QDF_STATUS_SUCCESS; @@ -286,7 +286,7 @@ static QDF_STATUS ocb_ndl_response(struct ocb_rx_event *evt) cbs = wlan_ocb_get_callbacks(pdev); ndl = &event->rsp.ndl; if (cbs && cbs->ocb_dcc_update_ndl_callback) { - ocb_debug("%s: NDL update response", __func__); + ocb_debug("NDL update response"); cbs->ocb_dcc_update_ndl_callback( cbs->ocb_dcc_update_ndl_context, ndl); status = QDF_STATUS_SUCCESS; @@ -324,7 +324,7 @@ static QDF_STATUS ocb_dcc_indication(struct ocb_rx_event *evt) cbs = wlan_ocb_get_callbacks(pdev); dcc_stats = &event->rsp.dcc_stats; if (cbs && cbs->ocb_dcc_stats_event_callback) { - ocb_debug("%s: DCC stats indication", __func__); + ocb_debug("DCC stats indication"); cbs->ocb_dcc_stats_event_callback( cbs->ocb_dcc_stats_event_context, dcc_stats); status = QDF_STATUS_SUCCESS; diff --git a/components/pmo/core/src/wlan_pmo_static_config.c b/components/pmo/core/src/wlan_pmo_static_config.c index 4003d072ae80..b745501c826e 100644 --- a/components/pmo/core/src/wlan_pmo_static_config.c +++ b/components/pmo/core/src/wlan_pmo_static_config.c @@ -416,8 +416,8 @@ pmo_register_action_frame_patterns(struct wlan_objmgr_vdev *vdev, for (i = 0; i < PMO_SUPPORTED_ACTION_CATE_ELE_LIST; i++) { if (i < ALLOWED_ACTION_FRAME_MAP_WORDS) - pmo_debug("%s: %d action Wakeup pattern 0x%x in fw", - __func__, i, cmd.action_category_map[i]); + pmo_debug("%d action Wakeup pattern 0x%x in fw", + i, cmd.action_category_map[i]); else cmd.action_category_map[i] = 0; } diff --git a/components/target_if/disa/src/target_if_disa.c b/components/target_if/disa/src/target_if_disa.c index 5e37fac75fa7..58209e06e3c6 100644 --- a/components/target_if/disa/src/target_if_disa.c +++ b/components/target_if/disa/src/target_if_disa.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2020 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 @@ -36,7 +36,7 @@ target_if_encrypt_decrypt_event_handler(ol_scn_t scn_handle, uint8_t *data, wmi_unified_t wmi_handle; if (!data) { - target_if_err("%s: invalid pointer", __func__); + target_if_err("Invalid pointer"); return -EINVAL; } diff --git a/components/target_if/ftm_time_sync/src/target_if_ftm_time_sync.c b/components/target_if/ftm_time_sync/src/target_if_ftm_time_sync.c index 570da99ebc18..95630a2a3a40 100644 --- a/components/target_if/ftm_time_sync/src/target_if_ftm_time_sync.c +++ b/components/target_if/ftm_time_sync/src/target_if_ftm_time_sync.c @@ -63,7 +63,7 @@ target_if_time_sync_ftm_start_stop_event_handler(ol_scn_t scn_handle, wmi_unified_t wmi_handle; if (!data) { - target_if_err("%s: invalid pointer", __func__); + target_if_err("Invalid pointer"); return -EINVAL; } @@ -124,7 +124,7 @@ target_if_time_sync_master_slave_offset_event_handler(ol_scn_t scn_handle, wmi_unified_t wmi_handle; if (!data) { - target_if_err("%s: invalid pointer", __func__); + target_if_err("Invalid pointer"); return -EINVAL; } diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 210a2b41e7fa..7b3707edd81d 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -1062,12 +1062,12 @@ stop_wmi: hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (!hif_ctx) - cds_err("%s: Failed to get hif_handle!", __func__); + cds_err("Failed to get hif_handle!"); wma_wmi_stop(); if (hif_ctx) { - cds_err("%s: Disable the isr & reset the soc!", __func__); + cds_err("Disable the isr & reset the soc!"); hif_disable_isr(hif_ctx); hif_reset_soc(hif_ctx); } @@ -2634,7 +2634,7 @@ bool cds_is_5_mhz_enabled(void) p_cds_context = cds_get_context(QDF_MODULE_ID_QDF); if (!p_cds_context) { - cds_err("%s: cds context is invalid", __func__); + cds_err("cds context is invalid"); return false; } @@ -2656,7 +2656,7 @@ bool cds_is_10_mhz_enabled(void) p_cds_context = cds_get_context(QDF_MODULE_ID_QDF); if (!p_cds_context) { - cds_err("%s: cds context is invalid", __func__); + cds_err("cds context is invalid"); return false; } @@ -2678,7 +2678,7 @@ bool cds_is_sub_20_mhz_enabled(void) p_cds_context = cds_get_context(QDF_MODULE_ID_QDF); if (!p_cds_context) { - cds_err("%s: cds context is invalid", __func__); + cds_err("cds context is invalid"); return false; } @@ -2699,7 +2699,7 @@ bool cds_is_self_recovery_enabled(void) p_cds_context = cds_get_context(QDF_MODULE_ID_QDF); if (!p_cds_context) { - cds_err("%s: cds context is invalid", __func__); + cds_err("cds context is invalid"); return false; } diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 9c040d2731d4..c1a142ebf01a 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -2252,7 +2252,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter, cdp_vdev_register(soc, adapter->vdev_id, (ol_osif_vdev_handle)adapter, &txrx_ops); if (!txrx_ops.tx.tx) { - hdd_err("%s vdev register fail", __func__); + hdd_err("vdev register fail"); return QDF_STATUS_E_FAILURE; } diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index be7352739876..42ea98cbb9d9 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -14376,8 +14376,7 @@ static int __wlan_hdd_cfg80211_get_nud_stats(struct wiphy *wiphy, skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, WLAN_NUD_STATS_LEN); if (!skb) { - hdd_err("%s: cfg80211_vendor_cmd_alloc_reply_skb failed", - __func__); + hdd_err("cfg80211_vendor_cmd_alloc_reply_skb failed"); err = -ENOMEM; goto exit; } @@ -19653,8 +19652,8 @@ static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *adapter, /* Sanity check on eLen */ if (eLen > remLen) { - hdd_err("%s: Invalid IE length[%d] for IE[0x%X]", - __func__, eLen, elementId); + hdd_err("Invalid IE length[%d] for IE[0x%X]", + eLen, elementId); QDF_ASSERT(0); return -EINVAL; } @@ -19688,8 +19687,8 @@ static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *adapter, assoc_add_ie->length; } else if (0 == memcmp(&genie[0], "\x00\x50\xf2", 3)) { if (eLen > (WLAN_MAX_IE_LEN - 2)) { - hdd_err("%s: Invalid WPA IE length[%d]", - __func__, eLen); + hdd_err("Invalid WPA IE length[%d]", + eLen); QDF_ASSERT(0); return -EINVAL; } @@ -19826,8 +19825,7 @@ static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *adapter, break; case DOT11F_EID_RSN: if (eLen > DOT11F_IE_RSN_MAX_LEN) { - hdd_err("%s: Invalid WPA RSN IE length[%d]", - __func__, eLen); + hdd_err("Invalid WPA RSN IE length[%d]", eLen); return -EINVAL; } memset(security_ie, 0, WLAN_MAX_IE_LEN); @@ -22260,8 +22258,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy, ftie->ie_len); hdd_err("Should be Re-assoc Req IEs"); } - hdd_debug("%s called with Ie of length = %zu", __func__, - ftie->ie_len); + hdd_debug("called with Ie of length = %zu", ftie->ie_len); /* Pass the received FT IEs to SME */ mac_handle = hdd_ctx->mac_handle; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index d9481454437c..6e7659406d6e 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -958,7 +958,7 @@ static int __hdd_netdev_notifier_call(struct net_device *net_dev, } if (hdd_ctx->driver_status == DRIVER_MODULES_CLOSED) { - hdd_debug("%s: Driver module is closed", __func__); + hdd_debug("Driver module is closed"); return NOTIFY_DONE; } @@ -3094,7 +3094,7 @@ hdd_update_cds_ac_specs_params(struct hdd_context *hdd_ctx) if (!hdd_ctx->config) { /* Do nothing if hdd_ctx is invalid */ - hdd_err("%s: Warning: hdd_ctx->cfg_ini is NULL", __func__); + hdd_err("Warning: hdd_ctx->cfg_ini is NULL"); return; } @@ -4744,7 +4744,7 @@ static void __hdd_set_multicast_list(struct net_device *dev) return; if (hdd_ctx->driver_status == DRIVER_MODULES_CLOSED) { - hdd_debug("%s: Driver module is closed", __func__); + hdd_debug("Driver module is closed"); return; } diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 689f978f4b23..66f367a15342 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2020 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 @@ -359,13 +359,13 @@ int hdd_napi_apply_throughput_policy(struct hdd_context *hddctx, struct qca_napi_data *napid = hdd_napi_get_all(); int enabled; - NAPI_DEBUG("-->%s(tx=%lld, rx=%lld)", __func__, tx_packets, rx_packets); + NAPI_DEBUG("-->(tx=%lld, rx=%lld)", tx_packets, rx_packets); if (unlikely(napi_tput_policy_delay < 0)) napi_tput_policy_delay = 0; if (napi_tput_policy_delay > 0) { - NAPI_DEBUG("%s: delaying policy; delay-count=%d", - __func__, napi_tput_policy_delay); + NAPI_DEBUG("delaying policy; delay-count=%d", + napi_tput_policy_delay); napi_tput_policy_delay--; /* make sure the next timer call calls us */ @@ -481,7 +481,7 @@ int hdd_display_napi_stats(void) napid = hdd_napi_get_all(); if (!napid) { - hdd_err("%s unable to retrieve napi structure", __func__); + hdd_err("unable to retrieve napi structure"); return -EFAULT; } hdd_nofl_info("[NAPI %u][BL %d]: scheds polls comps done t-lim p-lim corr max_time napi-buckets(%d)", @@ -540,7 +540,7 @@ int hdd_clear_napi_stats(void) napid = hdd_napi_get_all(); if (!napid) { - hdd_err("%s unable to retrieve napi structure", __func__); + hdd_err("unable to retrieve napi structure"); return -EFAULT; } diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 92ddc72dcb75..568a4ea9c21f 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -947,8 +947,7 @@ void hdd_reg_notifier(struct wiphy *wiphy, if (cds_is_driver_unloading() || cds_is_driver_recovering() || cds_is_driver_in_bad_state()) { - hdd_err("%s: unloading or ssr in progress, ignore", - __func__); + hdd_err("unloading or ssr in progress, ignore"); return; } @@ -958,7 +957,7 @@ void hdd_reg_notifier(struct wiphy *wiphy, } if (hdd_ctx->is_wiphy_suspended == true) { - hdd_err("%s: system/cfg80211 is already suspend", __func__); + hdd_err("system/cfg80211 is already suspend"); return; } diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index a8c983ce7431..d800c2c3f00f 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -5309,7 +5309,7 @@ static int __wlan_hdd_cfg80211_dump_station(struct wiphy *wiphy, int idx, u8 *mac, struct station_info *sinfo) { - hdd_debug("%s: idx %d", __func__, idx); + hdd_debug("idx: %d", idx); if (idx != 0) return -ENOENT; qdf_mem_copy(mac, dev->dev_addr, QDF_MAC_ADDR_SIZE); diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 41221d84ccc1..66e3bf258702 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -862,7 +862,7 @@ QDF_STATUS pe_open(struct mac_context *mac, struct cds_config_info *cds_cfg) if (!QDF_IS_STATUS_SUCCESS( cds_shutdown_notifier_register(pe_shutdown_notifier_cb, mac))) { - pe_err("%s: Shutdown notifier register failed", __func__); + pe_err("Shutdown notifier register failed"); } pe_hang_event_notifier.priv_data = mac; diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 10f9b2462666..204b9a992147 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -817,7 +817,7 @@ void lim_process_ft_aggr_qos_rsp(struct mac_context *mac, pe_session = pe_find_session_by_session_id(mac, pAggrQosRspMsg->sessionId); if (!pe_session) { - pe_err("Cant find session entry for %s", __func__); + pe_err("Cant find session entry"); if (pAggrQosRspMsg) { qdf_mem_free(pAggrQosRspMsg); } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 0e73dadf5644..ea15f60fbc88 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -5999,7 +5999,7 @@ static void csr_get_peer_rssi_cb(struct stats_event *ev, void *cookie) } if (!ev->peer_stats) { - sme_debug("%s no peer stats\n", __func__); + sme_debug("no peer stats"); goto disconnect_stats_complete; } @@ -6007,7 +6007,7 @@ static void csr_get_peer_rssi_cb(struct stats_event *ev, void *cookie) mac->peer_txrate = ev->peer_stats->tx_rate; mac->peer_rxrate = ev->peer_stats->rx_rate; if (!ev->peer_extended_stats) { - sme_debug("%s no peer extended stats\n", __func__); + sme_debug("no peer extended stats"); goto disconnect_stats_complete; } mac->rx_mc_bc_cnt = ev->peer_extended_stats->rx_mc_bc_cnt; @@ -17041,7 +17041,7 @@ csr_process_roam_pmkid_req_callback(struct mac_context *mac_ctx, 0, eCSR_ROAM_FIPS_PMK_REQUEST, eCSR_ROAM_RESULT_NONE); if (QDF_IS_STATUS_ERROR(status)) { - sme_err("%s: Trigger pmkid fallback failed", __func__); + sme_err("Trigger pmkid fallback failed"); qdf_mem_free(roam_info); return status; } @@ -17060,14 +17060,14 @@ csr_roam_pmkid_req_callback(uint8_t vdev_id, mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (!mac_ctx) { - sme_err("%s: NULL mac ptr", __func__); + sme_err("NULL mac ptr"); QDF_ASSERT(0); return -EINVAL; } status = sme_acquire_global_lock(&mac_ctx->sme); if (!QDF_IS_STATUS_SUCCESS(status)) { - sme_err("%s: Locking failed, bailing out", __func__); + sme_err("Locking failed, bailing out"); return status; } diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index e8792e4d2c29..785cdc4ccade 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -567,7 +567,7 @@ enum wlan_phymode wma_chan_phy_mode(uint32_t freq, enum phy_ch_width chan_width, } if (chan_width >= CH_WIDTH_INVALID) { - wma_err_rl("%s : Invalid channel width", __func__); + wma_err_rl("Invalid channel width"); return WLAN_PHYMODE_AUTO; } @@ -4119,7 +4119,7 @@ QDF_STATUS wma_set_sw_retry_threshold_per_ac(WMA_HANDLE handle, tp_wma_handle wma_handle = (tp_wma_handle)handle; if (!wma_handle) { - wma_err("%s: WMA context is invalid!", __func__); + wma_err("WMA context is invalid!"); return QDF_STATUS_E_INVAL; } diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index dee146132a9a..dbf626f1d021 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -418,7 +418,7 @@ int wma_roam_vdev_disconnect_event_handler(void *handle, uint8_t *event, tp_wma_handle wma = (tp_wma_handle)handle; if (!event) { - wma_err("%s: received null event from target", __func__); + wma_err("received null event from target"); return -EINVAL; } @@ -426,7 +426,7 @@ int wma_roam_vdev_disconnect_event_handler(void *handle, uint8_t *event, roam_vdev_disc_ev = param_buf->fixed_param; if (!roam_vdev_disc_ev) { - wma_err("%s: roam cap event is NULL", __func__); + wma_err("roam cap event is NULL"); return -EINVAL; } if (roam_vdev_disc_ev->vdev_id >= wma->max_bssid) { @@ -4042,8 +4042,8 @@ int wma_roam_stats_event_handler(WMA_HANDLE handle, uint8_t *event, &roam_info->btm_rsp, i); if (QDF_IS_STATUS_ERROR(status)) { - wma_err("%s:Roam btm rsp stats extract fail vdev %d", - __func__, vdev_id); + wma_err("Roam btm rsp stats extract fail vdev %d", + vdev_id); qdf_mem_free(roam_info); return -EINVAL; } @@ -4053,8 +4053,8 @@ int wma_roam_stats_event_handler(WMA_HANDLE handle, uint8_t *event, wma->wmi_handle, event, &roam_info->roam_init_info, i); if (QDF_IS_STATUS_ERROR(status)) { - wma_err("%s:Initial roam stats extract fail vdev %d", - __func__, vdev_id); + wma_err("Initial roam stats extract fail vdev %d", + vdev_id); qdf_mem_free(roam_info); return -EINVAL; } @@ -6616,7 +6616,7 @@ QDF_STATUS wma_set_roam_triggers(tp_wma_handle wma, void wma_register_pmkid_req_event_handler(tp_wma_handle wma_handle) { if (!wma_handle) { - wma_err("%s: pmkid req wma_handle is NULL", __func__); + wma_err("pmkid req wma_handle is NULL"); return; } @@ -6639,39 +6639,38 @@ int wma_roam_pmkid_request_event_handler(void *handle, uint8_t *event, QDF_STATUS status; if (!event) { - wma_err("%s: received null event from target", __func__); + wma_err("received null event from target"); return -EINVAL; } param_buf = (WMI_ROAM_PMKID_REQUEST_EVENTID_param_tlvs *)event; if (!param_buf) { - wma_err("%s: received null buf from target", __func__); + wma_err("received null buf from target"); return -EINVAL; } roam_pmkid_req_ev = param_buf->fixed_param; if (!roam_pmkid_req_ev) { - wma_err("%s: received null event data from target", __func__); + wma_err("received null event data from target"); return -EINVAL; } if (roam_pmkid_req_ev->vdev_id >= wma->max_bssid) { - wma_err("%s: received invalid vdev_id %d", - __func__, roam_pmkid_req_ev->vdev_id); + wma_err("received invalid vdev_id %d", roam_pmkid_req_ev->vdev_id); return -EINVAL; } num_entries = param_buf->num_pmkid_request; if (num_entries > MAX_RSSI_AVOID_BSSID_LIST) { - wma_err("%s: num bssid entries:%d exceeds maximum value", - __func__, num_entries); + wma_err("num bssid entries:%d exceeds maximum value", + num_entries); return -EINVAL; } src_list = param_buf->pmkid_request; if (len < (sizeof(*roam_pmkid_req_ev) + (num_entries * sizeof(*src_list)))) { - wma_err("%s: Invalid length:%d", __func__, len); + wma_err("Invalid length: %d", len); return -EINVAL; } @@ -6687,7 +6686,7 @@ int wma_roam_pmkid_request_event_handler(void *handle, uint8_t *event, if (qdf_is_macaddr_zero(roam_bsslist) || qdf_is_macaddr_broadcast(roam_bsslist) || qdf_is_macaddr_group(roam_bsslist)) { - wma_err("%s: Invalid bssid", __func__); + wma_err("Invalid bssid"); qdf_mem_free(dst_list); return -EINVAL; } @@ -6701,7 +6700,7 @@ int wma_roam_pmkid_request_event_handler(void *handle, uint8_t *event, status = wma->csr_roam_pmkid_req_cb(roam_pmkid_req_ev->vdev_id, dst_list); if (QDF_IS_STATUS_ERROR(status)) { - wma_err("%s: Pmkid request failed", __func__); + wma_err("Pmkid request failed"); qdf_mem_free(dst_list); return -EINVAL; } diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 6becab9199e6..62471c2d5d83 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -669,11 +669,11 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, struct cdp_txrx_ext_stats ext_stats = {0}; struct cdp_soc_t *soc_hdl = cds_get_context(QDF_MODULE_ID_SOC); - wma_debug("%s: Posting stats ext event to SME", __func__); + wma_debug("Posting stats ext event to SME"); param_buf = (WMI_STATS_EXT_EVENTID_param_tlvs *)event_buf; if (!param_buf) { - wma_err("%s: Invalid stats ext event buf", __func__); + wma_err("Invalid stats ext event buf"); return -EINVAL; } @@ -721,7 +721,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, return -EFAULT; } - wma_debug("%s: stats ext event Posted to SME", __func__); + wma_debug("stats ext event Posted to SME"); return 0; } #else