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
This commit is contained in:
Rajeev Kumar
2016-01-19 15:23:52 -08:00
committed by Akash Patel
parent e04c726b30
commit e3b4b4b480
14 changed files with 18 additions and 18 deletions

View File

@@ -623,7 +623,7 @@ void ol_target_failure(void *instance, CDF_STATUS status)
return; 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!", BMI_ERR("%s: Loading/Unloading is in progress, ignore!",
__func__); __func__);
return; return;

View File

@@ -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. * 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(); enum cds_driver_state state = cds_get_driver_state();

View File

@@ -120,7 +120,7 @@ cds_cpu_hotplug_notify(struct notifier_block *block,
if ((NULL == pSchedContext) || (NULL == pSchedContext->ol_rx_thread)) if ((NULL == pSchedContext) || (NULL == pSchedContext->ol_rx_thread))
return NOTIFY_OK; return NOTIFY_OK;
if (cds_is_load_unload_in_progress()) if (cds_is_load_or_unload_in_progress())
return NOTIFY_OK; return NOTIFY_OK;
num_cpus = num_possible_cpus(); num_cpus = num_possible_cpus();

View File

@@ -879,7 +879,7 @@ static void hdd_send_association_event(struct net_device *dev,
msg = NULL; msg = NULL;
/*During the WLAN uninitialization,supplicant is stopped before the /*During the WLAN uninitialization,supplicant is stopped before the
driver so not sending the status of the connection to supplicant */ 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); wireless_send_event(dev, we_event, &wrqu, msg);
#ifdef FEATURE_WLAN_ESE #ifdef FEATURE_WLAN_ESE
if (eConnectionState_Associated == 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 * before the driver so not sending the status of the
* connection to supplicant. * connection to supplicant.
*/ */
if (cds_is_load_unload_in_progress()) { if (cds_is_load_or_unload_in_progress()) {
#ifdef WLAN_FEATURE_P2P_DEBUG #ifdef WLAN_FEATURE_P2P_DEBUG
if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) {
if (global_p2p_connection_status == if (global_p2p_connection_status ==

View File

@@ -346,7 +346,7 @@ static void wlan_hdd_shutdown(void)
{ {
void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); 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"); hdd_err("Load/unload in progress, ignore SSR shutdown");
return; return;
} }

View File

@@ -222,7 +222,7 @@ static int __hdd_hostapd_open(struct net_device *dev)
MTRACE(cdf_trace(CDF_MODULE_ID_HDD, MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0)); 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", hdd_err("Driver load/unload in progress, ignore, state: 0x%x",
cds_get_driver_state()); cds_get_driver_state());
goto done; goto done;

View File

@@ -527,7 +527,7 @@ int wlan_hdd_validate_context(hdd_context_t *hdd_ctx)
return -EAGAIN; 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", hdd_err("Unloading/Loading in Progress. Ignore!!!: 0x%x",
cds_get_driver_state()); cds_get_driver_state());
return -EAGAIN; return -EAGAIN;

View File

@@ -2333,7 +2333,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,
return ret; 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!!!", hdd_err("Unload/Load in Progress, state: 0x%x. Ignore!!!",
cds_get_driver_state()); cds_get_driver_state());
return ret; return ret;

View File

@@ -809,7 +809,7 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter)
/* bss deregister is not allowed during wlan driver loading or /* bss deregister is not allowed during wlan driver loading or
* unloading * 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, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!", "%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!",
__func__, cds_get_driver_state()); __func__, cds_get_driver_state());

View File

@@ -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); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
/* Check whether driver load unload is in progress */ /* 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.")); hddLog(LOGE, FL("Driver load/unload is in progress."));
return; return;
} }

View File

@@ -764,7 +764,7 @@ void hif_crash_shutdown(void *hif_ctx)
return; 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__); HIF_ERROR("%s: Load/unload is in progress, ignore!", __func__);
return; return;
} }

View File

@@ -116,7 +116,7 @@ void host_diag_log_submit(void *plog_hdr_ptr)
uint16_t data_len; uint16_t data_len;
uint16_t total_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, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
"%s: Unloading/Loading in Progress. Ignore!!!", "%s: Unloading/Loading in Progress. Ignore!!!",
__func__); __func__);
@@ -213,7 +213,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length,
event_report_t *pEvent_report; event_report_t *pEvent_report;
uint16_t total_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, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
"%s: Unloading/Loading in Progress. Ignore!!!", "%s: Unloading/Loading in Progress. Ignore!!!",
__func__); __func__);

View File

@@ -806,7 +806,7 @@ static void wma_data_tx_ack_work_handler(void *ack_work)
tp_wma_handle wma_handle; tp_wma_handle wma_handle;
pWMAAckFnTxComp ack_cb; 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__); WMA_LOGE("%s: Driver load/unload in progress", __func__);
return; return;
} }
@@ -1480,7 +1480,7 @@ static void wma_mgmt_tx_ack_work_handler(void *ack_work)
tp_wma_handle wma_handle; tp_wma_handle wma_handle;
pWMAAckFnTxComp ack_cb; 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__); WMA_LOGE("%s: Driver load/unload in progress", __func__);
return; return;
} }

View File

@@ -3176,7 +3176,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data,
return -ENOMEM; return -ENOMEM;
} }
if (cds_is_load_unload_in_progress()) { if (cds_is_load_or_unload_in_progress()) {
WMA_LOGE("Load/Unload in progress"); WMA_LOGE("Load/Unload in progress");
return -EINVAL; return -EINVAL;
} }