qcacld-3.0: Rename API cds_is_load_unload_in_progress
Rename API cds_is_load_unload_in_progress() to
cds_is_load_or_unload_in_progress() for clarity purpose.
Change-Id: I209c661ccee760f822d5df53577d822f3c741b37
CRs-Fixed: 964217
diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c
index e73d5c8..ddb08fe 100644
--- a/core/bmi/src/ol_fw.c
+++ b/core/bmi/src/ol_fw.c
@@ -623,7 +623,7 @@
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 588f0e2..c88218f 100644
--- a/core/cds/inc/cds_api.h
+++ b/core/cds/inc/cds_api.h
@@ -114,11 +114,11 @@
}
/**
- * 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 077bfc3..a30b031 100644
--- a/core/cds/src/cds_sched.c
+++ b/core/cds/src/cds_sched.c
@@ -120,7 +120,7 @@
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 15b7f8b..06c8c16 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -879,7 +879,7 @@
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 @@
* 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 c366b90..cb4603a 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -346,7 +346,7 @@
{
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 0e69738..b43b4ec 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -222,7 +222,7 @@
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 315170e..0278c1d 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -527,7 +527,7 @@
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 0b5ec7c..1a708a6 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -2333,7 +2333,7 @@
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 d6b98e1..6983085 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 @@
/* 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 d7e1cac..8e48da6 100644
--- a/core/hdd/src/wlan_hdd_tdls.c
+++ b/core/hdd/src/wlan_hdd_tdls.c
@@ -2842,7 +2842,7 @@
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 e76c64c..5ee1727 100644
--- a/core/hif/src/hif_main.c
+++ b/core/hif/src/hif_main.c
@@ -764,7 +764,7 @@
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 4fd357e..168ccd7 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 @@
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 @@
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 e93e499..91bb65d 100644
--- a/core/wma/src/wma_data.c
+++ b/core/wma/src/wma_data.c
@@ -806,7 +806,7 @@
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 @@
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 6827e25..d9da162 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -3176,7 +3176,7 @@
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;
}