diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index e73d5c8a65..ddb08fefce 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -623,7 +623,7 @@ void ol_target_failure(void *instance, CDF_STATUS status) return; } - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { BMI_ERR("%s: Loading/Unloading is in progress, ignore!", __func__); return; diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 588f0e2c17..c88218f8f7 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -114,11 +114,11 @@ static inline bool cds_is_driver_recovering(void) } /** - * cds_is_load_unload_in_progress() - Is driver load/unload in progress + * cds_is_load_or_unload_in_progress() - Is driver load OR unload in progress * * Return: true if driver is loading OR unloading and false otherwise. */ -static inline bool cds_is_load_unload_in_progress(void) +static inline bool cds_is_load_or_unload_in_progress(void) { enum cds_driver_state state = cds_get_driver_state(); diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index 077bfc3468..a30b031b12 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -120,7 +120,7 @@ cds_cpu_hotplug_notify(struct notifier_block *block, if ((NULL == pSchedContext) || (NULL == pSchedContext->ol_rx_thread)) return NOTIFY_OK; - if (cds_is_load_unload_in_progress()) + if (cds_is_load_or_unload_in_progress()) return NOTIFY_OK; num_cpus = num_possible_cpus(); diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 15b7f8bc53..06c8c16cc7 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -879,7 +879,7 @@ static void hdd_send_association_event(struct net_device *dev, msg = NULL; /*During the WLAN uninitialization,supplicant is stopped before the driver so not sending the status of the connection to supplicant */ - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { wireless_send_event(dev, we_event, &wrqu, msg); #ifdef FEATURE_WLAN_ESE if (eConnectionState_Associated == @@ -1068,7 +1068,7 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, * before the driver so not sending the status of the * connection to supplicant. */ - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { #ifdef WLAN_FEATURE_P2P_DEBUG if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { if (global_p2p_connection_status == diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index c366b90918..cb4603a76a 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -346,7 +346,7 @@ static void wlan_hdd_shutdown(void) { void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { hdd_err("Load/unload in progress, ignore SSR shutdown"); return; } diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 0e69738968..b43b4ecf2f 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -222,7 +222,7 @@ static int __hdd_hostapd_open(struct net_device *dev) MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0)); - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { hdd_err("Driver load/unload in progress, ignore, state: 0x%x", cds_get_driver_state()); goto done; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 315170ef91..0278c1dea8 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -527,7 +527,7 @@ int wlan_hdd_validate_context(hdd_context_t *hdd_ctx) return -EAGAIN; } - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { hdd_err("Unloading/Loading in Progress. Ignore!!!: 0x%x", cds_get_driver_state()); return -EAGAIN; diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 0b5ec7c2e5..1a708a60b8 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -2333,7 +2333,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, return ret; } - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { hdd_err("Unload/Load in Progress, state: 0x%x. Ignore!!!", cds_get_driver_state()); return ret; diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index d6b98e132b..698308566a 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -809,7 +809,7 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) /* bss deregister is not allowed during wlan driver loading or * unloading */ - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!", __func__, cds_get_driver_state()); diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index d7e1cacc64..8e48da640e 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -2842,7 +2842,7 @@ void wlan_hdd_tdls_timer_restart(hdd_adapter_t *pAdapter, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); /* Check whether driver load unload is in progress */ - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { hddLog(LOGE, FL("Driver load/unload is in progress.")); return; } diff --git a/core/hif/src/hif_main.c b/core/hif/src/hif_main.c index e76c64c9a5..5ee1727197 100644 --- a/core/hif/src/hif_main.c +++ b/core/hif/src/hif_main.c @@ -764,7 +764,7 @@ void hif_crash_shutdown(void *hif_ctx) return; } - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { HIF_ERROR("%s: Load/unload is in progress, ignore!", __func__); return; } diff --git a/core/utils/host_diag_log/src/host_diag_log.c b/core/utils/host_diag_log/src/host_diag_log.c index 4fd357eb15..168ccd7dec 100644 --- a/core/utils/host_diag_log/src/host_diag_log.c +++ b/core/utils/host_diag_log/src/host_diag_log.c @@ -116,7 +116,7 @@ void host_diag_log_submit(void *plog_hdr_ptr) uint16_t data_len; uint16_t total_len; - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, "%s: Unloading/Loading in Progress. Ignore!!!", __func__); @@ -213,7 +213,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, event_report_t *pEvent_report; uint16_t total_len; - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, "%s: Unloading/Loading in Progress. Ignore!!!", __func__); diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index e93e49979d..91bb65d4b5 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -806,7 +806,7 @@ static void wma_data_tx_ack_work_handler(void *ack_work) tp_wma_handle wma_handle; pWMAAckFnTxComp ack_cb; - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { WMA_LOGE("%s: Driver load/unload in progress", __func__); return; } @@ -1480,7 +1480,7 @@ static void wma_mgmt_tx_ack_work_handler(void *ack_work) tp_wma_handle wma_handle; pWMAAckFnTxComp ack_cb; - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { WMA_LOGE("%s: Driver load/unload in progress", __func__); return; } diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 6827e25ce2..d9da162670 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -3176,7 +3176,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, return -ENOMEM; } - if (cds_is_load_unload_in_progress()) { + if (cds_is_load_or_unload_in_progress()) { WMA_LOGE("Load/Unload in progress"); return -EINVAL; }