From 1a9632c7a0c670bcebcd5790428d281c5a082ec0 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Thu, 9 Apr 2020 16:37:16 -0700 Subject: [PATCH] qcacld-3.0: Clean up remaining references of WLAN_POWER_DEBUGFS Power stats is moved from debugfs to sysfs as part of commit I10df003fe8f79d35d0758b56d971f4973d27750b and hence remove the remaining references of WLAN_POWER_DEBUGFS. Change-Id: Iba29387ab93740595560e068e4bd4ede8efafbc9 CRs-Fixed: 2661078 --- core/mac/inc/sir_api.h | 2 -- core/sme/inc/sme_api.h | 2 -- core/sme/inc/sme_internal.h | 2 -- core/sme/src/common/sme_api.c | 2 -- core/wma/src/wma_features.c | 8 -------- core/wma/src/wma_main.c | 9 --------- 6 files changed, 25 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 85d2690716a5..01239a0d2c6c 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3331,7 +3331,6 @@ struct auto_shutdown_cmd { }; #endif -#ifdef WLAN_POWER_DEBUGFS /** * struct power_stats_response - Power stats response * @cumulative_sleep_time_ms: cumulative sleep time in ms @@ -3351,7 +3350,6 @@ struct power_stats_response { uint32_t num_debug_register; uint32_t *debug_registers; }; -#endif #ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS #define MAX_BCNMISS_BITMAP 8 diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 464ddf9ea602..6ddb5c37fa1f 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -2294,13 +2294,11 @@ QDF_STATUS sme_set_lost_link_info_cb(mac_handle_t mac_handle, */ QDF_STATUS sme_update_new_channel_event(mac_handle_t mac_handle, uint8_t session_id); -#ifdef WLAN_POWER_DEBUGFS QDF_STATUS sme_power_debug_stats_req( mac_handle_t mac_handle, void (*callback_fn)(struct power_stats_response *response, void *context), void *power_stats_context); -#endif #ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS /** diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 47e0ce9faeb8..8ab37879d3d0 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -298,11 +298,9 @@ struct sme_context { link_layer_stats_cb link_layer_stats_cb; void (*link_layer_stats_ext_cb)(hdd_handle_t callback_ctx, tSirLLStatsResults *rsp); -#ifdef WLAN_POWER_DEBUGFS void *power_debug_stats_context; void (*power_stats_resp_callback)(struct power_stats_response *rsp, void *callback_context); -#endif #ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS void *beacon_stats_context; void (*beacon_stats_resp_callback)(struct bcn_reception_stats_rsp *rsp, diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 57afb30fe563..096814da5879 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -10797,7 +10797,6 @@ QDF_STATUS sme_ll_stats_set_thresh(mac_handle_t mac_handle, #endif /* WLAN_FEATURE_LINK_LAYER_STATS */ -#ifdef WLAN_POWER_DEBUGFS /** * sme_power_debug_stats_req() - SME API to collect Power debug stats * @callback_fn: Pointer to the callback function for Power stats event @@ -10836,7 +10835,6 @@ QDF_STATUS sme_power_debug_stats_req( } return status; } -#endif #ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS QDF_STATUS sme_beacon_debug_stats_req( diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index cd18b0f2f42d..256514ac7597 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -4828,7 +4828,6 @@ int wma_get_arp_stats_handler(void *handle, uint8_t *data, * * Return: 0 on success, error number otherwise */ -#ifdef WLAN_POWER_DEBUGFS int wma_unified_power_debug_stats_event_handler(void *handle, uint8_t *cmd_param_info, uint32_t len) { @@ -4902,13 +4901,6 @@ int wma_unified_power_debug_stats_event_handler(void *handle, qdf_mem_free(power_stats_results); return 0; } -#else -int wma_unified_power_debug_stats_event_handler(void *handle, - uint8_t *cmd_param_info, uint32_t len) -{ - return 0; -} -#endif #ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS int wma_unified_beacon_debug_stats_event_handler(void *handle, uint8_t *cmd_param_info, diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 4ca56a3973f5..656dfdc20388 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -3152,13 +3152,11 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc, wma_peer_info_event_handler, WMA_RX_SERIALIZER_CTX); -#ifdef WLAN_POWER_DEBUGFS /* register for Chip Power stats event */ wmi_unified_register_event_handler(wma_handle->wmi_handle, wmi_pdev_chip_power_stats_event_id, wma_unified_power_debug_stats_event_handler, WMA_RX_SERIALIZER_CTX); -#endif #ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS /* register for beacon stats event */ wmi_unified_register_event_handler(wma_handle->wmi_handle, @@ -7491,7 +7489,6 @@ static inline QDF_STATUS wma_send_wow_pulse_cmd(tp_wma_handle wma_handle, * * Return: QDF_STATUS */ -#ifdef WLAN_POWER_DEBUGFS static QDF_STATUS wma_process_power_debug_stats_req(tp_wma_handle wma_handle) { wmi_pdev_get_chip_power_stats_cmd_fixed_param *cmd; @@ -7529,12 +7526,6 @@ static QDF_STATUS wma_process_power_debug_stats_req(tp_wma_handle wma_handle) } return QDF_STATUS_SUCCESS; } -#else -static QDF_STATUS wma_process_power_debug_stats_req(tp_wma_handle wma_handle) -{ - return QDF_STATUS_SUCCESS; -} -#endif #ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS static QDF_STATUS wma_process_beacon_debug_stats_req(tp_wma_handle wma_handle, uint32_t *vdev_id)