Revert "qcacld-3.0: Prevent runtime suspend on ll_stats and get station requests"

This reverts commit I7704a3b9b3e8ad187677705e1b11fbd82be73cfb.

This change cause CXPC failure, as each ll_status will cause
runtime pm resume.

Change-Id: I3547181fb8cfee1e5e40992dfaf5547eaac29a2a
CRs-Fixed: 3110499

core/hdd/inc/wlan_hdd_main.h

@@ -1172,7 +1172,6 @@ struct hdd_chan_change_params {
  * @is_user_wakelock_acquired: boolean to check if user wakelock status
  * @monitor_mode: monitor mode context to prevent/allow runtime pm
  * @wow_unit_test: wow unit test mode context to prevent/allow runtime pm
- * @stats: stats context to prevent/allow runtime pm
  *
  * Runtime PM control for underlying activities
  */
@@ -1183,7 +1182,6 @@ struct hdd_runtime_pm_context {
 	bool is_user_wakelock_acquired;
 	qdf_runtime_lock_t monitor_mode;
 	qdf_runtime_lock_t wow_unit_test;
-	qdf_runtime_lock_t stats;
 };
 
 /*

core/hdd/src/wlan_hdd_main.c

@@ -1551,7 +1551,6 @@ static void hdd_runtime_suspend_context_init(struct hdd_context *hdd_ctx)
 	qdf_runtime_lock_init(&ctx->user);
 	qdf_runtime_lock_init(&ctx->monitor_mode);
 	qdf_runtime_lock_init(&ctx->wow_unit_test);
-	qdf_runtime_lock_init(&ctx->stats);
 
 	ctx->is_user_wakelock_acquired = false;
 
@@ -1571,7 +1570,6 @@ static void hdd_runtime_suspend_context_deinit(struct hdd_context *hdd_ctx)
 	if (ctx->is_user_wakelock_acquired)
 		qdf_runtime_pm_allow_suspend(&ctx->user);
 
-	qdf_runtime_lock_deinit(&ctx->stats);
 	qdf_runtime_lock_deinit(&ctx->wow_unit_test);
 	qdf_runtime_lock_deinit(&ctx->monitor_mode);
 	qdf_runtime_lock_deinit(&ctx->user);

core/hdd/src/wlan_hdd_stats.c

@@ -2077,8 +2077,6 @@ static int wlan_hdd_send_ll_stats_req(struct hdd_adapter *adapter,
 		return -ENOMEM;
 	}
 
-	qdf_runtime_pm_prevent_suspend(&hdd_ctx->runtime_context.stats);
-
 	cookie = osif_request_cookie(request);
 
 	priv = osif_request_priv(request);
@@ -2130,8 +2128,6 @@ exit:
 	hdd_exit();
 	osif_request_put(request);
 
-	qdf_runtime_pm_allow_suspend(&hdd_ctx->runtime_context.stats);
-
 	if (adapter->ll_stats_failure_count >=
 					HDD_MAX_ALLOWED_LL_STATS_FAILURE) {
 		cds_trigger_recovery(QDF_STATS_REQ_TIMEDOUT);
@@ -6995,23 +6991,16 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter)
 	int ret = 0;
 	struct stats_event *stats;
 	struct wlan_objmgr_vdev *vdev;
-	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	if (!get_station_fw_request_needed) {
 		hdd_debug("return cached get_station stats");
 		return 0;
 	}
 
-	ret = wlan_hdd_validate_context(hdd_ctx);
-	if (ret)
-		return ret;
-
 	vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_STATS_ID);
 	if (!vdev)
 		return -EINVAL;
 
-	qdf_runtime_pm_prevent_suspend(&hdd_ctx->runtime_context.stats);
-
 	stats = wlan_cfg80211_mc_cp_stats_get_station_stats(vdev, &ret);
 	if (ret || !stats) {
 		wlan_cfg80211_mc_cp_stats_free_stats_event(stats);
@@ -7024,7 +7013,6 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter)
 	wlan_cfg80211_mc_cp_stats_free_stats_event(stats);
 
 out:
-	qdf_runtime_pm_allow_suspend(&hdd_ctx->runtime_context.stats);
 	hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
 	return ret;
 }