浏览代码

qcacld-3.0: Do not wait for probe in module_init

Module_init waits for probe to complete after registering the
driver. But this is unnecessary and module load is intended for
loading the module but probe would be called when hardware is
ready. Remove the wait during module_init.

Change-Id: Ic2fe7efa78a1527acf1fd5b7689d70f6d450ccd3
CRs-fixed: 950170
Prashanth Bhatta 9 年之前
父节点
当前提交
699ae77958
共有 1 个文件被更改,包括 0 次插入14 次删除
  1. 0 14
      core/hdd/src/wlan_hdd_main.c

+ 0 - 14
core/hdd/src/wlan_hdd_main.c

@@ -174,7 +174,6 @@ static const struct wiphy_wowlan_support wowlan_support_reg_init = {
 
 struct sock *cesium_nl_srv_sock;
 
-struct completion wlan_start_comp;
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
 void wlan_hdd_auto_shutdown_cb(void);
 #endif
@@ -5079,7 +5078,6 @@ ftm_processing:
 		cds_set_load_unload_in_progress(false);
 		hdd_ctx->isLoadInProgress = false;
 		hddLog(LOGE, FL("FTM driver loaded"));
-		complete(&wlan_start_comp);
 		return CDF_STATUS_SUCCESS;
 	}
 #if defined(CONFIG_HDD_INIT_WITH_RTNL_LOCK)
@@ -5461,7 +5459,6 @@ ftm_processing:
 
 	hdd_ctx->isLoadInProgress = false;
 	cds_set_load_unload_in_progress(false);
-	complete(&wlan_start_comp);
 
 	goto success;
 
@@ -6502,7 +6499,6 @@ void hdd_deinit(void)
 static int __hdd_module_init(void)
 {
 	int ret = 0;
-	unsigned long rc;
 
 	pr_info("%s: Loading driver v%s\n", WLAN_MODULE_NAME,
 		QWLAN_VERSIONSTR TIMER_MANAGER_STR MEMORY_DEBUG_STR);
@@ -6511,22 +6507,12 @@ static int __hdd_module_init(void)
 
 	hdd_set_conparam((uint32_t) con_mode);
 
-	init_completion(&wlan_start_comp);
-
 	ret = wlan_hdd_register_driver();
 	if (ret) {
 		pr_err("%s: driver load failure\n", WLAN_MODULE_NAME);
 		goto out;
 	}
 
-	rc = wait_for_completion_timeout(&wlan_start_comp,
-			msecs_to_jiffies(HDD_WLAN_START_WAIT_TIME));
-
-	if (!rc) {
-		hdd_alert("Timed-out waiting for wlan_hdd_register_driver");
-		goto out;
-	}
-
 	pr_info("%s: driver loaded\n", WLAN_MODULE_NAME);
 
 	return 0;