qcacld-3.0: Remove hdd_context.hdd_psoc

The name 'hdd_psoc' is misleading, since it is not actually an HDD psoc
context. Rather, it is the Object Manager psoc context. Rename hdd_psoc
to psoc for consistency, and to make room for HDD to have its own psoc
context.

After I1aa67d0554400ed552dc488805ba3421531a26c3, replace the
remaining instances of hdd_psoc and finally remove hdd_psoc from
hdd_context.

Change-Id: If9a4941e18a75563f9ab978bd4b38bd1145e4ada
CRs-Fixed: 2312429

core/hdd/inc/wlan_hdd_main.h

@@ -1708,10 +1708,7 @@ struct hdd_cache_channels {
  * @g_event_flags: a bitmap of hdd_driver_flags
  */
 struct hdd_context {
-	union {
-		struct wlan_objmgr_psoc *psoc;
-		struct wlan_objmgr_psoc *hdd_psoc;
-	};
+	struct wlan_objmgr_psoc *psoc;
 	struct wlan_objmgr_pdev *pdev;
 	mac_handle_t mac_handle;
 	struct wiphy *wiphy;
@@ -2374,8 +2371,7 @@ static inline bool roaming_offload_enabled(struct hdd_context *hdd_ctx)
 {
 	bool is_roam_offload;
 
-	ucfg_mlme_get_roaming_offload(hdd_ctx->hdd_psoc,
-				      &is_roam_offload);
+	ucfg_mlme_get_roaming_offload(hdd_ctx->psoc, &is_roam_offload);
 
 	return is_roam_offload;
 }

core/hdd/src/wlan_hdd_cfg.c

@@ -4886,7 +4886,7 @@ static void hdd_set_power_save_offload_config(struct hdd_context *hdd_ctx)
 		 * Make sure CFG is updated because PE reads this
 		 * from CFG at the time of assoc or reassoc
 		 */
-		ucfg_mlme_set_sap_listen_interval(hdd_ctx->hdd_psoc,
+		ucfg_mlme_set_sap_listen_interval(hdd_ctx->psoc,
 						  listenInterval);
 	}
 

core/hdd/src/wlan_hdd_cfg80211.c

@@ -3344,7 +3344,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy,
 			QCA_WLAN_VENDOR_FEATURE_P2P_LISTEN_OFFLOAD);
 
 	value = 0;
-	status = ucfg_mlme_get_oce_sta_enabled_info(hdd_ctx->hdd_psoc, &value);
+	status = ucfg_mlme_get_oce_sta_enabled_info(hdd_ctx->psoc, &value);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("could not get OCE STA enable info");
 	if (value)
@@ -3352,7 +3352,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy,
 					      QCA_WLAN_VENDOR_FEATURE_OCE_STA);
 
 	value = 0;
-	status = ucfg_mlme_get_oce_sap_enabled_info(hdd_ctx->hdd_psoc, &value);
+	status = ucfg_mlme_get_oce_sap_enabled_info(hdd_ctx->psoc, &value);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("could not get OCE SAP enable info");
 	if (value)
@@ -6031,13 +6031,13 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
 		hdd_debug("Set disable_fils - %d", disable_fils);
 		value = !disable_fils;
 
-		qdf_status = ucfg_mlme_set_fils_enabled_info(hdd_ctx->hdd_psoc,
+		qdf_status = ucfg_mlme_set_fils_enabled_info(hdd_ctx->psoc,
 							     value);
 		if (QDF_IS_STATUS_ERROR(qdf_status))
 			hdd_err("could not set fils enabled info");
 
-		qdf_status = ucfg_mlme_set_enable_bcast_probe_rsp(
-					hdd_ctx->hdd_psoc, value);
+		qdf_status = ucfg_mlme_set_enable_bcast_probe_rsp(hdd_ctx->psoc,
+								  value);
 		if (QDF_IS_STATUS_ERROR(qdf_status))
 			hdd_err("could not set enable bcast probe resp info");
 
@@ -12409,12 +12409,12 @@ void wlan_hdd_update_wiphy(struct hdd_context *hdd_ctx)
 	bool fils_enabled;
 	QDF_STATUS status;
 
-	ucfg_mlme_get_sap_max_peers(hdd_ctx->hdd_psoc, &value);
+	ucfg_mlme_get_sap_max_peers(hdd_ctx->psoc, &value);
 	hdd_ctx->wiphy->max_ap_assoc_sta = value;
 	wlan_hdd_update_ht_cap(hdd_ctx);
 
 	fils_enabled = 0;
-	status = ucfg_mlme_get_fils_enabled_info(hdd_ctx->hdd_psoc,
+	status = ucfg_mlme_get_fils_enabled_info(hdd_ctx->psoc,
 						 &fils_enabled);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("could not get fils enabled info");
@@ -12728,8 +12728,7 @@ QDF_STATUS wlan_hdd_validate_operation_channel(struct hdd_adapter *adapter,
 
 	num_ch = WNI_CFG_VALID_CHANNEL_LIST_LEN;
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	status = ucfg_mlme_get_sap_allow_all_channels(hdd_ctx->hdd_psoc,
-						      &value);
+	status = ucfg_mlme_get_sap_allow_all_channels(hdd_ctx->psoc, &value);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_err("Unable to fetch sap allow all channels");
 	if (value) {
@@ -15207,7 +15206,7 @@ static int wlan_hdd_cfg80211_set_fils_config(struct hdd_adapter *adapter,
 	roam_profile = hdd_roam_profile(adapter);
 
 	value = 0;
-	status = ucfg_mlme_get_fils_enabled_info(hdd_ctx->hdd_psoc, &value);
+	status = ucfg_mlme_get_fils_enabled_info(hdd_ctx->psoc, &value);
 	if (QDF_IS_STATUS_ERROR(status) || !value) {
 		hdd_err("get_fils_enabled status: %d fils_enabled: %d",
 			status, value);
@@ -17323,7 +17322,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 	if (cfg_in_range(CFG_BEACON_INTERVAL, params->beacon_interval))
 		roam_profile->beaconInterval = params->beacon_interval;
 	else
-		roam_profile->beaconInterval = cfg_get(hdd_ctx->hdd_psoc,
+		roam_profile->beaconInterval = cfg_get(hdd_ctx->psoc,
 						       CFG_BEACON_INTERVAL);
 
 	/* Set Channel */

core/hdd/src/wlan_hdd_ext_scan.c

@@ -1645,7 +1645,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}
@@ -1784,7 +1784,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy,
 	if (0 != retval)
 		return -EINVAL;
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}
@@ -1983,7 +1983,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
 	if (0 != retval)
 		return -EINVAL;
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}
@@ -2422,7 +2422,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy,
 	if (0 != ret)
 		return -EINVAL;
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}
@@ -2650,11 +2650,11 @@ static int hdd_extscan_start_fill_bucket_channel_spec(
 	uint32_t min_dwell_time_passive_bucket;
 	uint32_t max_dwell_time_passive_bucket;
 
-	ucfg_extscan_get_active_min_time(hdd_ctx->hdd_psoc,
+	ucfg_extscan_get_active_min_time(hdd_ctx->psoc,
 					&extscan_active_min_chn_time);
-	ucfg_extscan_get_active_max_time(hdd_ctx->hdd_psoc,
+	ucfg_extscan_get_active_max_time(hdd_ctx->psoc,
 					 &max_dwell_time_active_bucket);
-	ucfg_extscan_get_passive_max_time(hdd_ctx->hdd_psoc,
+	ucfg_extscan_get_passive_max_time(hdd_ctx->psoc,
 					 &max_dwell_time_passive_bucket);
 
 	min_dwell_time_active_bucket = max_dwell_time_active_bucket;
@@ -3125,7 +3125,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy,
 	if (0 != retval)
 		return -EINVAL;
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}
@@ -3339,7 +3339,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy,
 	if (0 != retval)
 		return -EINVAL;
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}
@@ -3467,7 +3467,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy,
 	if (0 != retval)
 		return -EINVAL;
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}
@@ -3582,7 +3582,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy *wiphy,
 	if (0 != retval)
 		return -EINVAL;
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}
@@ -3792,7 +3792,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy,
 	if (ret_val)
 		return ret_val;
 
-	if (!ucfg_extscan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!ucfg_extscan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("extscan not supported");
 		return -ENOTSUPP;
 	}

core/hdd/src/wlan_hdd_hostapd.c

@@ -4616,9 +4616,9 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	pConfig->auto_channel_select_weight =
 			     iniConfig->auto_channel_select_weight;
 	pConfig->disableDFSChSwitch = iniConfig->disableDFSChSwitch;
-	ucfg_mlme_get_sap_chn_switch_bcn_count(hdd_ctx->hdd_psoc, &value);
+	ucfg_mlme_get_sap_chn_switch_bcn_count(hdd_ctx->psoc, &value);
 	pConfig->sap_chanswitch_beacon_cnt = value;
-	ucfg_mlme_get_sap_channel_switch_mode(hdd_ctx->hdd_psoc, &val);
+	ucfg_mlme_get_sap_channel_switch_mode(hdd_ctx->psoc, &val);
 	pConfig->sap_chanswitch_mode = val;
 
 	/* channel is already set in the set_channel Call back */
@@ -4627,7 +4627,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	/* Protection parameter to enable or disable */
 	pConfig->protEnabled = iniConfig->apProtEnabled;
 
-	ucfg_mlme_get_sap_chan_switch_rate_enabled(hdd_ctx->hdd_psoc, &val);
+	ucfg_mlme_get_sap_chan_switch_rate_enabled(hdd_ctx->psoc, &val);
 	pConfig->chan_switch_hostapd_rate_enabled = val;
 
 	if (iniConfig->WlanMccToSccSwitchMode !=
@@ -4636,7 +4636,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	}
 	pConfig->enOverLapCh = iniConfig->gEnableOverLapCh;
 
-	ucfg_mlme_get_sap_reduces_beacon_interval(hdd_ctx->hdd_psoc, &value);
+	ucfg_mlme_get_sap_reduces_beacon_interval(hdd_ctx->psoc, &value);
 	pConfig->dtim_period = pBeacon->dtim_period;
 	pConfig->dfs_beacon_tx_enhanced = iniConfig->dfs_beacon_tx_enhanced;
 

core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -541,7 +541,7 @@ static __iw_softap_setparam(struct net_device *dev,
 				hdd_warn("Setting it to max allowed and continuing");
 				set_value = WNI_CFG_ASSOC_STA_LIMIT_STAMAX;
 			}
-			if (ucfg_mlme_set_assoc_sta_limit(hdd_ctx->hdd_psoc,
+			if (ucfg_mlme_set_assoc_sta_limit(hdd_ctx->psoc,
 							  set_value) !=
 			    QDF_STATUS_SUCCESS) {
 				hdd_err("CFG_ASSOC_STA_LIMIT failed");
@@ -1221,7 +1221,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	switch (sub_cmd) {
 	case QCSAP_PARAM_MAX_ASSOC:
-		if (ucfg_mlme_set_assoc_sta_limit(hdd_ctx->hdd_psoc, *value) !=
+		if (ucfg_mlme_set_assoc_sta_limit(hdd_ctx->psoc, *value) !=
 		    QDF_STATUS_SUCCESS) {
 			hdd_err("CFG_ASSOC_STA_LIMIT failed");
 			ret = -EIO;

core/hdd/src/wlan_hdd_ioctl.c

@@ -5109,7 +5109,7 @@ static int drv_cmd_set_rmc_action_period(struct hdd_adapter *adapter,
 	hdd_debug("uActionPeriod %d", uActionPeriod);
 	mac_handle = hdd_ctx->mac_handle;
 
-	if (ucfg_mlme_set_rmc_action_period_freq(hdd_ctx->hdd_psoc,
+	if (ucfg_mlme_set_rmc_action_period_freq(hdd_ctx->psoc,
 						 uActionPeriod) !=
 						 QDF_STATUS_SUCCESS) {
 		hdd_err("Could not set SETRMCACTIONPERIOD %d", uActionPeriod);

core/hdd/src/wlan_hdd_main.c

@@ -1274,7 +1274,7 @@ static void hdd_update_tgt_services(struct hdd_context *hdd_ctx,
 #endif
 	hdd_update_roam_offload(hdd_ctx, cfg);
 
-	if (ucfg_mlme_get_sap_get_peer_info(hdd_ctx->hdd_psoc, &value) ==
+	if (ucfg_mlme_get_sap_get_peer_info(hdd_ctx->psoc, &value) ==
 	   QDF_STATUS_SUCCESS)
 		value &= cfg->get_peer_info_enabled;
 
@@ -4566,7 +4566,7 @@ static int hdd_send_coex_config_params(struct hdd_context *hdd_ctx,
 {
 	struct coex_config_params coex_cfg_params = {0};
 	struct wlan_fwol_coex_config config = {0};
-	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
+	struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;
 	QDF_STATUS status;
 
 	if (!hdd_ctx) {
@@ -5542,7 +5542,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 			hdd_notify_tdls_reset_adapter(adapter->vdev);
 			adapter->session.station.hdd_reassoc_scenario = false;
 		}
-		ucfg_mlme_get_sap_internal_restart(hdd_ctx->hdd_psoc, &value);
+		ucfg_mlme_get_sap_internal_restart(hdd_ctx->psoc, &value);
 		if (value &&
 		    adapter->device_mode == QDF_SAP_MODE) {
 			wlan_hdd_netif_queue_control(adapter,
@@ -6371,7 +6371,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 			break;
 
 		case QDF_SAP_MODE:
-			ucfg_mlme_get_sap_internal_restart(hdd_ctx->hdd_psoc,
+			ucfg_mlme_get_sap_internal_restart(hdd_ctx->psoc,
 							   &value);
 			if (value)
 				hdd_start_ap_adapter(adapter);
@@ -8617,7 +8617,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 			hdd_debug("sending coex indication");
 			wlan_hdd_send_svc_nlink_msg(hdd_ctxt->radio_index,
 					WLAN_SVC_LTE_COEX_IND, NULL, 0);
-			ucfg_mlme_get_sap_internal_restart(hdd_ctxt->hdd_psoc,
+			ucfg_mlme_get_sap_internal_restart(hdd_ctxt->psoc,
 							   &value);
 			hdd_debug("driver to start sap: %d", value);
 			if (value)
@@ -9614,10 +9614,9 @@ static int hdd_update_cds_config(struct hdd_context *hdd_ctx)
 
 	cds_cfg->enable_mc_list = hdd_ctx->config->fEnableMCAddrList;
 
-	ucfg_mlme_get_sap_max_offload_peers(hdd_ctx->hdd_psoc,
-					    &value);
+	ucfg_mlme_get_sap_max_offload_peers(hdd_ctx->psoc, &value);
 	cds_cfg->ap_maxoffload_peers = value;
-	ucfg_mlme_get_sap_max_offload_reorder_buffs(hdd_ctx->hdd_psoc,
+	ucfg_mlme_get_sap_max_offload_reorder_buffs(hdd_ctx->psoc,
 						    &value);
 	cds_cfg->ap_maxoffload_reorderbuffs = value;
 
@@ -9675,7 +9674,7 @@ static int hdd_update_cds_config(struct hdd_context *hdd_ctx)
 	cds_cfg->apf_packet_filter_enable =
 		hdd_ctx->config->apf_packet_filter_enable;
 	cds_cfg->self_gen_frm_pwr = hdd_ctx->config->self_gen_frm_pwr;
-	ucfg_mlme_get_sap_max_peers(hdd_ctx->hdd_psoc, &value);
+	ucfg_mlme_get_sap_max_peers(hdd_ctx->psoc, &value);
 	cds_cfg->max_station = value;
 	cds_cfg->sub_20_channel_width = WLAN_SUB_20_CH_WIDTH_NONE;
 	cds_cfg->flow_steering_enabled = hdd_ctx->config->flow_steering_enable;
@@ -9773,7 +9772,7 @@ static int hdd_init_thermal_info(struct hdd_context *hdd_ctx)
 	thermal_param.sme_throttle_duty_cycle_tbl[3] =
 		hdd_ctx->config->throttle_dutycycle_level3;
 
-	status = ucfg_fwol_get_thermal_temp(hdd_ctx->hdd_psoc, &thermal_temp);
+	status = ucfg_fwol_get_thermal_temp(hdd_ctx->psoc, &thermal_temp);
 	if (QDF_IS_STATUS_ERROR(status))
 		return qdf_status_to_os_return(status);
 
@@ -10849,7 +10848,7 @@ int hdd_configure_cds(struct hdd_context *hdd_ctx)
 				    set_value, PDEV_CMD);
 	}
 
-	ucfg_mlme_get_sap_get_peer_info(hdd_ctx->hdd_psoc, &value);
+	ucfg_mlme_get_sap_get_peer_info(hdd_ctx->psoc, &value);
 	if (value) {
 		set_value = value;
 		sme_cli_set_command(0,

core/hdd/src/wlan_hdd_nan.c

@@ -69,7 +69,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy,
 		return -EPERM;
 	}
 
-	if (!cfg_nan_get_enable(hdd_ctx->hdd_psoc)) {
+	if (!cfg_nan_get_enable(hdd_ctx->psoc)) {
 		hdd_err("NaN support is not enabled in INI");
 		return -EPERM;
 	}
@@ -157,6 +157,6 @@ void wlan_hdd_cfg80211_nan_callback(hdd_handle_t hdd_handle, tSirNanEvent *msg)
  */
 bool wlan_hdd_nan_is_supported(struct hdd_context *hdd_ctx)
 {
-	return cfg_nan_get_enable(hdd_ctx->hdd_psoc) &&
+	return cfg_nan_get_enable(hdd_ctx->psoc) &&
 		sme_is_feature_supported_by_fw(NAN);
 }

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -52,11 +52,11 @@ void hdd_nan_datapath_target_config(struct hdd_context *hdd_ctx,
 					struct wma_tgt_cfg *tgt_cfg)
 {
 	hdd_ctx->nan_datapath_enabled =
-			cfg_nan_get_datapath_enable(hdd_ctx->hdd_psoc) &&
+			cfg_nan_get_datapath_enable(hdd_ctx->psoc) &&
 			tgt_cfg->nan_datapath_enabled;
 	hdd_debug("NAN Datapath Enable: %d (Host: %d FW: %d)",
 		  hdd_ctx->nan_datapath_enabled,
-		  cfg_nan_get_datapath_enable(hdd_ctx->hdd_psoc),
+		  cfg_nan_get_datapath_enable(hdd_ctx->psoc),
 		  tgt_cfg->nan_datapath_enabled);
 }
 
@@ -355,7 +355,7 @@ static int __wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
 		return -EPERM;
 	}
 
-	return os_if_nan_process_ndp_cmd(hdd_ctx->hdd_psoc,
+	return os_if_nan_process_ndp_cmd(hdd_ctx->psoc,
 					 data, data_len);
 }
 
@@ -472,7 +472,7 @@ int hdd_ndi_open(char *iface_name)
 		return -EINVAL;
 	}
 
-	if (cfg_nan_get_ndi_mac_randomize(hdd_ctx->hdd_psoc)) {
+	if (cfg_nan_get_ndi_mac_randomize(hdd_ctx->psoc)) {
 		if (hdd_get_random_nan_mac_addr(hdd_ctx, &random_ndi_mac)) {
 			hdd_err("get random mac address failed");
 			return -EFAULT;
@@ -511,7 +511,7 @@ int hdd_ndi_start(char *iface_name, uint16_t transaction_id)
 		return -EINVAL;
 	}
 
-	op_channel = cfg_nan_get_ndi_channel(hdd_ctx->hdd_psoc);
+	op_channel = cfg_nan_get_ndi_channel(hdd_ctx->psoc);
 	adapter = hdd_get_adapter_by_iface_name(hdd_ctx, iface_name);
 	if (!adapter) {
 		hdd_err("adapter is null");

core/hdd/src/wlan_hdd_object_manager.c

@@ -104,7 +104,7 @@ int hdd_objmgr_create_and_store_psoc(struct hdd_context *hdd_ctx,
 	}
 
 	hdd_init_psoc_qdf_ctx(psoc);
-	hdd_ctx->hdd_psoc = psoc;
+	hdd_ctx->psoc = psoc;
 
 	return 0;
 
@@ -117,9 +117,9 @@ psoc_destroy:
 int hdd_objmgr_release_and_destroy_psoc(struct hdd_context *hdd_ctx)
 {
 	QDF_STATUS status;
-	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
+	struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;
 
-	hdd_ctx->hdd_psoc = NULL;
+	hdd_ctx->psoc = NULL;
 
 	QDF_BUG(psoc);
 	if (!psoc)
@@ -136,7 +136,7 @@ int hdd_objmgr_release_and_destroy_psoc(struct hdd_context *hdd_ctx)
 void hdd_objmgr_update_tgt_max_vdev_psoc(struct hdd_context *hdd_ctx,
 					 uint8_t max_vdev)
 {
-	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
+	struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;
 
 	if (!psoc) {
 		hdd_err("Psoc NULL");
@@ -149,7 +149,7 @@ void hdd_objmgr_update_tgt_max_vdev_psoc(struct hdd_context *hdd_ctx,
 int hdd_objmgr_create_and_store_pdev(struct hdd_context *hdd_ctx)
 {
 	QDF_STATUS status;
-	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
+	struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;
 	struct wlan_objmgr_pdev *pdev;
 	struct pdev_osif_priv *priv;
 	struct wlan_psoc_host_hal_reg_capabilities_ext *reg_cap_ptr;

core/hdd/src/wlan_hdd_p2p.c

@@ -686,7 +686,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 	}
 
 	adapter = NULL;
-	cfg_p2p_get_device_addr_admin(hdd_ctx->hdd_psoc, &p2p_dev_addr_admin);
+	cfg_p2p_get_device_addr_admin(hdd_ctx->psoc, &p2p_dev_addr_admin);
 	if (p2p_dev_addr_admin &&
 	    ((NL80211_IFTYPE_P2P_GO == type) ||
 	     (NL80211_IFTYPE_P2P_CLIENT == type))) {
@@ -1028,7 +1028,7 @@ int wlan_hdd_set_power_save(struct hdd_adapter *adapter,
 	}
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	psoc = hdd_ctx->hdd_psoc;
+	psoc = hdd_ctx->psoc;
 	if (!psoc) {
 		hdd_err("psoc is null");
 		return -EINVAL;
@@ -1211,7 +1211,7 @@ static uint32_t set_second_connection_operating_channel(
 	uint8_t operating_channel;
 
 	operating_channel = policy_mgr_get_mcc_operating_channel(
-		hdd_ctx->hdd_psoc, vdev_id);
+		hdd_ctx->psoc, vdev_id);
 
 	if (operating_channel == 0) {
 		hdd_err("Second adapter operating channel is invalid");
@@ -1264,7 +1264,7 @@ int wlan_hdd_set_mcc_p2p_quota(struct hdd_adapter *adapter,
 	}
 
 	concurrent_state = policy_mgr_get_concurrency_mode(
-		hdd_ctx->hdd_psoc);
+		hdd_ctx->psoc);
 	/*
 	 * Check if concurrency mode is active.
 	 * Need to modify this code to support MCC modes other than STA/P2P
@@ -1324,7 +1324,7 @@ void wlan_hdd_set_mcc_latency(struct hdd_adapter *adapter, int set_value)
 	}
 
 	concurrent_state = policy_mgr_get_concurrency_mode(
-		hdd_ctx->hdd_psoc);
+		hdd_ctx->psoc);
 	/**
 	 * Check if concurrency mode is active.
 	 * Need to modify this code to support MCC modes other than STA/P2P

core/hdd/src/wlan_hdd_p2p_listen_offload.c

@@ -82,7 +82,7 @@ static int wlan_hdd_listen_offload_start(struct hdd_adapter *adapter,
 	}
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	psoc = hdd_ctx->hdd_psoc;
+	psoc = hdd_ctx->psoc;
 	if (!psoc) {
 		hdd_err("psoc is null");
 		return -EINVAL;
@@ -282,7 +282,7 @@ static int wlan_hdd_listen_offload_stop(struct hdd_adapter *adapter)
 
 	vdev_id = (uint32_t)adapter->session_id;
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	psoc = hdd_ctx->hdd_psoc;
+	psoc = hdd_ctx->psoc;
 	if (!psoc) {
 		hdd_err("psoc is null");
 		return -EINVAL;

core/hdd/src/wlan_hdd_packet_filter.c

@@ -213,7 +213,7 @@ int wlan_hdd_set_filter(struct hdd_context *hdd_ctx,
 		}
 
 		if (QDF_STATUS_SUCCESS !=
-			pmo_ucfg_set_pkt_filter(hdd_ctx->hdd_psoc,
+			pmo_ucfg_set_pkt_filter(hdd_ctx->psoc,
 				pmo_set_pkt_fltr_req,
 				sessionId)) {
 			hdd_err("Failure to execute Set Filter");
@@ -236,7 +236,7 @@ int wlan_hdd_set_filter(struct hdd_context *hdd_ctx,
 
 		pmo_clr_pkt_fltr_param->filter_id = request->filter_id;
 		if (QDF_STATUS_SUCCESS !=
-			pmo_ucfg_clear_pkt_filter(hdd_ctx->hdd_psoc,
+			pmo_ucfg_clear_pkt_filter(hdd_ctx->psoc,
 			    pmo_clr_pkt_fltr_param,
 			    sessionId)) {
 			hdd_err("Failure to execute Clear Filter");

core/hdd/src/wlan_hdd_power.c

@@ -348,7 +348,7 @@ void hdd_enable_ns_offload(struct hdd_adapter *adapter,
 			   enum pmo_offload_trigger trigger)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
+	struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;
 	struct inet6_dev *in6_dev;
 	struct pmo_ns_req *ns_req;
 	QDF_STATUS status;
@@ -682,8 +682,7 @@ static int hdd_set_grat_arp_keepalive(struct hdd_adapter *adapter)
 		     sizeof(req.destIpv4Addr));
 
 	qdf_copy_macaddr(&req.bssid, &sta_ctx->conn_info.bssId);
-	ucfg_mlme_get_sta_keep_alive_period(hdd_ctx->hdd_psoc,
-					    &req.timePeriod);
+	ucfg_mlme_get_sta_keep_alive_period(hdd_ctx->psoc, &req.timePeriod);
 	req.sessionId = adapter->session_id;
 
 	hdd_debug("Setting gratuitous ARP keepalive; ipv4_addr:%u.%u.%u.%u",
@@ -866,7 +865,7 @@ void hdd_enable_arp_offload(struct hdd_adapter *adapter,
 			    enum pmo_offload_trigger trigger)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
+	struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;
 	QDF_STATUS status;
 	struct pmo_arp_req *arp_req;
 	struct in_ifaddr *ifa;
@@ -950,7 +949,7 @@ void hdd_enable_mc_addr_filtering(struct hdd_adapter *adapter,
 	if (!hdd_adapter_is_connected_sta(adapter))
 		goto out;
 
-	status = pmo_ucfg_enable_mc_addr_filtering_in_fwr(hdd_ctx->hdd_psoc,
+	status = pmo_ucfg_enable_mc_addr_filtering_in_fwr(hdd_ctx->psoc,
 							  adapter->session_id,
 							  trigger);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -974,7 +973,7 @@ void hdd_disable_mc_addr_filtering(struct hdd_adapter *adapter,
 	if (!hdd_adapter_is_connected_sta(adapter))
 		goto out;
 
-	status = pmo_ucfg_disable_mc_addr_filtering_in_fwr(hdd_ctx->hdd_psoc,
+	status = pmo_ucfg_disable_mc_addr_filtering_in_fwr(hdd_ctx->psoc,
 							   adapter->session_id,
 							   trigger);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -1007,14 +1006,14 @@ void hdd_disable_and_flush_mc_addr_list(struct hdd_adapter *adapter,
 		goto flush_mc_list;
 
 	/* disable mc list first because the mc list is cached in PMO */
-	status = pmo_ucfg_disable_mc_addr_filtering_in_fwr(hdd_ctx->hdd_psoc,
+	status = pmo_ucfg_disable_mc_addr_filtering_in_fwr(hdd_ctx->psoc,
 							   adapter->session_id,
 							   trigger);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("failed to disable mc list; status:%d", status);
 
 flush_mc_list:
-	status = pmo_ucfg_flush_mc_addr_list(hdd_ctx->hdd_psoc,
+	status = pmo_ucfg_flush_mc_addr_list(hdd_ctx->psoc,
 					     adapter->session_id);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("failed to flush mc list; status:%d", status);
@@ -1093,7 +1092,7 @@ hdd_suspend_wlan(void)
 		hdd_update_conn_state_mask(adapter, &conn_state_mask);
 	}
 
-	status = pmo_ucfg_psoc_user_space_suspend_req(hdd_ctx->hdd_psoc,
+	status = pmo_ucfg_psoc_user_space_suspend_req(hdd_ctx->psoc,
 			QDF_SYSTEM_SUSPEND);
 	if (status != QDF_STATUS_SUCCESS)
 		return -EAGAIN;
@@ -1152,7 +1151,7 @@ static int hdd_resume_wlan(void)
 	}
 
 	ucfg_ipa_resume(hdd_ctx->pdev);
-	status = pmo_ucfg_psoc_user_space_resume_req(hdd_ctx->hdd_psoc,
+	status = pmo_ucfg_psoc_user_space_resume_req(hdd_ctx->psoc,
 						     QDF_SYSTEM_SUSPEND);
 	if (QDF_IS_STATUS_ERROR(status))
 		return qdf_status_to_os_return(status);
@@ -1211,7 +1210,7 @@ QDF_STATUS hdd_wlan_shutdown(void)
 	}
 
 	hdd_bus_bw_compute_timer_stop(hdd_ctx);
-	policy_mgr_clear_concurrent_session_count(hdd_ctx->hdd_psoc);
+	policy_mgr_clear_concurrent_session_count(hdd_ctx->psoc);
 
 	hdd_debug("Invoking packetdump deregistration API");
 	wlan_deregister_txrx_packetdump();
@@ -1369,7 +1368,7 @@ QDF_STATUS hdd_wlan_re_init(void)
 	hdd_send_default_scan_ies(hdd_ctx);
 	hdd_info("WLAN host driver reinitiation completed!");
 
-	ucfg_mlme_get_sap_internal_restart(hdd_ctx->hdd_psoc, &value);
+	ucfg_mlme_get_sap_internal_restart(hdd_ctx->psoc, &value);
 	if (value)
 		hdd_ssr_restart_sap(hdd_ctx);
 
@@ -1689,8 +1688,8 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 		}
 	}
 	/* p2p cleanup task based on scheduler */
-	ucfg_p2p_cleanup_tx_by_psoc(hdd_ctx->hdd_psoc);
-	ucfg_p2p_cleanup_roc_by_psoc(hdd_ctx->hdd_psoc);
+	ucfg_p2p_cleanup_tx_by_psoc(hdd_ctx->psoc);
+	ucfg_p2p_cleanup_roc_by_psoc(hdd_ctx->psoc);
 
 	/* Stop ongoing scan on each interface */
 	hdd_for_each_adapter(hdd_ctx, adapter) {

core/hdd/src/wlan_hdd_regulatory.c

@@ -540,15 +540,15 @@ static int hdd_regulatory_init_no_offload(struct hdd_context *hdd_ctx,
 
 	reg_info->cc_src = SOURCE_DRIVER;
 
-	ucfg_reg_set_default_country(hdd_ctx->hdd_psoc, reg_info->alpha2);
+	ucfg_reg_set_default_country(hdd_ctx->psoc, reg_info->alpha2);
 
 	cds_fill_and_send_ctl_to_fw(reg_info);
 
 	wlan_reg_get_dfs_region(hdd_ctx->pdev, &dfs_reg);
 
 	reg_program_config_vars(hdd_ctx, &config_vars);
-	ucfg_reg_set_config_vars(hdd_ctx->hdd_psoc, config_vars);
-	ucfg_reg_program_mas_chan_list(hdd_ctx->hdd_psoc,
+	ucfg_reg_set_config_vars(hdd_ctx->psoc, config_vars);
+	ucfg_reg_program_mas_chan_list(hdd_ctx->psoc,
 				       reg_channels,
 				       hdd_ctx->reg.alpha2,
 				       dfs_reg);
@@ -1026,8 +1026,8 @@ void hdd_reg_notifier(struct wiphy *wiphy,
 		wlan_reg_get_dfs_region(hdd_ctx->pdev, &dfs_reg);
 
 		reg_program_config_vars(hdd_ctx, &config_vars);
-		ucfg_reg_set_config_vars(hdd_ctx->hdd_psoc, config_vars);
-		ucfg_reg_program_mas_chan_list(hdd_ctx->hdd_psoc,
+		ucfg_reg_set_config_vars(hdd_ctx->psoc, config_vars);
+		ucfg_reg_program_mas_chan_list(hdd_ctx->psoc,
 					       reg_channels,
 					       hdd_ctx->reg.alpha2,
 					       dfs_reg);
@@ -1315,7 +1315,7 @@ static void hdd_regulatory_dyn_cbk(struct wlan_objmgr_psoc *psoc,
 	fill_wiphy_band_channels(wiphy, chan_list, NL80211_BAND_2GHZ);
 	fill_wiphy_band_channels(wiphy, chan_list, NL80211_BAND_5GHZ);
 
-	cc_src = ucfg_reg_get_cc_and_src(hdd_ctx->hdd_psoc, alpha2);
+	cc_src = ucfg_reg_get_cc_and_src(hdd_ctx->psoc, alpha2);
 	qdf_mem_copy(hdd_ctx->reg.alpha2, alpha2, REG_ALPHA2_LEN + 1);
 	sme_set_cc_src(hdd_ctx->mac_handle, cc_src);
 
@@ -1346,11 +1346,11 @@ int hdd_regulatory_init(struct hdd_context *hdd_ctx, struct wiphy *wiphy)
 	uint8_t alpha2[REG_ALPHA2_LEN + 1];
 
 	reg_program_config_vars(hdd_ctx, &config_vars);
-	ucfg_reg_register_chan_change_callback(hdd_ctx->hdd_psoc,
+	ucfg_reg_register_chan_change_callback(hdd_ctx->psoc,
 					       hdd_regulatory_dyn_cbk,
 					       NULL);
 
-	ucfg_reg_set_config_vars(hdd_ctx->hdd_psoc, config_vars);
+	ucfg_reg_set_config_vars(hdd_ctx->psoc, config_vars);
 
 	wiphy->regulatory_flags |= REGULATORY_WIPHY_SELF_MANAGED;
 	/* Check the kernel version for upstream commit aced43ce780dc5 that
@@ -1362,7 +1362,7 @@ int hdd_regulatory_init(struct hdd_context *hdd_ctx, struct wiphy *wiphy)
 	wiphy->features |= NL80211_FEATURE_CELL_BASE_REG_HINTS;
 #endif
 	wiphy->reg_notifier = hdd_reg_notifier;
-	offload_enabled = ucfg_reg_is_regdb_offloaded(hdd_ctx->hdd_psoc);
+	offload_enabled = ucfg_reg_is_regdb_offloaded(hdd_ctx->psoc);
 	hdd_debug("regulatory offload_enabled %d", offload_enabled);
 	if (offload_enabled) {
 		hdd_ctx->reg_offload = true;
@@ -1373,7 +1373,7 @@ int hdd_regulatory_init(struct hdd_context *hdd_ctx, struct wiphy *wiphy)
 		fill_wiphy_band_channels(wiphy, cur_chan_list,
 					 NL80211_BAND_5GHZ);
 
-		cc_src = ucfg_reg_get_cc_and_src(hdd_ctx->hdd_psoc, alpha2);
+		cc_src = ucfg_reg_get_cc_and_src(hdd_ctx->psoc, alpha2);
 		qdf_mem_copy(hdd_ctx->reg.alpha2, alpha2, REG_ALPHA2_LEN + 1);
 		sme_set_cc_src(hdd_ctx->mac_handle, cc_src);
 	} else {

core/hdd/src/wlan_hdd_sap_cond_chan_switch.c

@@ -112,13 +112,13 @@ static int wlan_hdd_validate_and_get_pre_cac_ch(struct hdd_context *hdd_ctx,
 		 * 6. But, we are in need of a DFS channel. So, going with the
 		 * first channel from the valid channel list.
 		 */
-		status = policy_mgr_get_valid_chans(hdd_ctx->hdd_psoc,
+		status = policy_mgr_get_valid_chans(hdd_ctx->psoc,
 						    channel_list, &len);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			hdd_err("Failed to get channel list");
 			return -EINVAL;
 		}
-		policy_mgr_update_with_safe_channel_list(hdd_ctx->hdd_psoc,
+		policy_mgr_update_with_safe_channel_list(hdd_ctx->psoc,
 							 channel_list, &len,
 							 pcl_weights,
 							 weight_len);
@@ -180,7 +180,7 @@ int wlan_hdd_request_pre_cac(uint8_t channel)
 	if (wlan_hdd_validate_context(hdd_ctx) != 0)
 		return -EINVAL;
 
-	if (policy_mgr_get_connection_count(hdd_ctx->hdd_psoc) > 1) {
+	if (policy_mgr_get_connection_count(hdd_ctx->psoc) > 1) {
 		hdd_err("pre cac not allowed in concurrency");
 		return -EINVAL;
 	}
@@ -331,7 +331,7 @@ int wlan_hdd_request_pre_cac(uint8_t channel)
 	 * connection update should result in DBS mode
 	 */
 	status = policy_mgr_update_and_wait_for_connection_update(
-					hdd_ctx->hdd_psoc,
+					hdd_ctx->psoc,
 					ap_adapter->session_id,
 					pre_cac_chan,
 					POLICY_MGR_UPDATE_REASON_PRE_CAC);

core/hdd/src/wlan_hdd_scan.c

@@ -523,10 +523,10 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 			con_dfs_ch =
 				con_sap_adapter->session.ap.operating_channel;
 
-		if (!policy_mgr_is_hw_dbs_capable(hdd_ctx->hdd_psoc) &&
+		if (!policy_mgr_is_hw_dbs_capable(hdd_ctx->psoc) &&
 			wlan_reg_is_dfs_ch(hdd_ctx->pdev, con_dfs_ch) &&
 			!policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan(
-			hdd_ctx->hdd_psoc)) {
+			hdd_ctx->psoc)) {
 			/* Provide empty scan result during DFS operation since
 			 * scanning not supported during DFS. Reason is
 			 * following case:

core/hdd/src/wlan_hdd_station_info.c

@@ -1009,7 +1009,7 @@ static int hdd_get_connected_station_info(struct hdd_context *hdd_ctx,
 		(sizeof(stainfo->is_qos_enabled) + NLA_HDRLEN) +
 		(sizeof(stainfo->mode) + NLA_HDRLEN);
 
-	status = ucfg_mlme_get_sap_get_peer_info(hdd_ctx->hdd_psoc, &value);
+	status = ucfg_mlme_get_sap_get_peer_info(hdd_ctx->psoc, &value);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_err("Unable to fetch sap ger peer info");
 	if (!value ||

core/hdd/src/wlan_hdd_stats.c

@@ -4433,16 +4433,16 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy,
 		rx_nss = adapter->hdd_stats.class_a_stat.rx_nss;
 
 		if ((tx_nss > 1) &&
-		    policy_mgr_is_current_hwmode_dbs(hdd_ctx->hdd_psoc) &&
-		    !policy_mgr_is_hw_dbs_2x2_capable(hdd_ctx->hdd_psoc)) {
+		    policy_mgr_is_current_hwmode_dbs(hdd_ctx->psoc) &&
+		    !policy_mgr_is_hw_dbs_2x2_capable(hdd_ctx->psoc)) {
 			hdd_debug("Hw mode is DBS, Reduce nss(%d) to 1",
 				  tx_nss);
 			tx_nss--;
 		}
 
 		if ((rx_nss > 1) &&
-		    policy_mgr_is_current_hwmode_dbs(hdd_ctx->hdd_psoc) &&
-		    !policy_mgr_is_hw_dbs_2x2_capable(hdd_ctx->hdd_psoc)) {
+		    policy_mgr_is_current_hwmode_dbs(hdd_ctx->psoc) &&
+		    !policy_mgr_is_hw_dbs_2x2_capable(hdd_ctx->psoc)) {
 			hdd_debug("Hw mode is DBS, Reduce nss(%d) to 1",
 				  rx_nss);
 			rx_nss--;

core/hdd/src/wlan_hdd_tdls.c

@@ -466,7 +466,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return -EINVAL;
 
-	cfg_tdls_get_support_enable(hdd_ctx->hdd_psoc, &tdls_support);
+	cfg_tdls_get_support_enable(hdd_ctx->psoc, &tdls_support);
 	if (!tdls_support) {
 		hdd_debug("TDLS Disabled in INI OR not enabled in FW. "
 			"Cannot process TDLS commands");
@@ -641,7 +641,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 	if (wlan_hdd_validate_session_id(adapter->session_id))
 		return -EINVAL;
 
-	cfg_tdls_get_support_enable(hdd_ctx->hdd_psoc, &tdls_support);
+	cfg_tdls_get_support_enable(hdd_ctx->psoc, &tdls_support);
 	if (!tdls_support) {
 		hdd_debug("TDLS Disabled in INI OR not enabled in FW. "
 			"Cannot process TDLS commands");
@@ -801,7 +801,7 @@ int hdd_set_tdls_scan_type(struct hdd_context *hdd_ctx, int val)
 		return -EINVAL;
 	}
 
-	cfg_tdls_set_scan_enable(hdd_ctx->hdd_psoc, (bool)val);
+	cfg_tdls_set_scan_enable(hdd_ctx->psoc, (bool)val);
 
 	return 0;
 }

core/hdd/src/wlan_hdd_wext.c

@@ -3080,7 +3080,7 @@ static int wlan_hdd_write_suspend_resume_stats(struct hdd_context *hdd_ctx,
 			sr_stats->suspend_fail[SUSPEND_FAIL_SCAN],
 			sr_stats->suspend_fail[SUSPEND_FAIL_INITIAL_WAKEUP]);
 
-	status = ucfg_mc_cp_stats_write_wow_stats(hdd_ctx->hdd_psoc,
+	status = ucfg_mc_cp_stats_write_wow_stats(hdd_ctx->psoc,
 						  &buffer[ret], max_len - ret,
 						  &ret);
 	if (QDF_IS_STATUS_ERROR(status)) {
@@ -3423,14 +3423,14 @@ int hdd_set_ldpc(struct hdd_adapter *adapter, int value)
 		hdd_err("LDCP is already disabled");
 		return 0;
 	}
-	status = ucfg_mlme_get_ht_cap_info(hdd_ctx->hdd_psoc, &ht_cap_info);
+	status = ucfg_mlme_get_ht_cap_info(hdd_ctx->psoc, &ht_cap_info);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Failed to get HT capability info");
 		return -EIO;
 	}
 
 	ht_cap_info.adv_coding_cap = value;
-	status = ucfg_mlme_set_ht_cap_info(hdd_ctx->hdd_psoc, ht_cap_info);
+	status = ucfg_mlme_set_ht_cap_info(hdd_ctx->psoc, ht_cap_info);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Failed to set HT capability info");
 		return -EIO;
@@ -3497,7 +3497,7 @@ int hdd_set_tx_stbc(struct hdd_adapter *adapter, int value)
 	hdd_debug("%d", value);
 	if (value) {
 		/* make sure HT capabilities allow this */
-		status = ucfg_mlme_get_ht_cap_info(hdd_ctx->hdd_psoc,
+		status = ucfg_mlme_get_ht_cap_info(hdd_ctx->psoc,
 						   &ht_cap_info);
 		if (QDF_STATUS_SUCCESS != status) {
 			hdd_err("Failed to get HT capability info");
@@ -3563,7 +3563,7 @@ int hdd_set_rx_stbc(struct hdd_adapter *adapter, int value)
 	hdd_debug("%d", value);
 	if (value) {
 		/* make sure HT capabilities allow this */
-		status = ucfg_mlme_get_ht_cap_info(hdd_ctx->hdd_psoc,
+		status = ucfg_mlme_get_ht_cap_info(hdd_ctx->psoc,
 						   &ht_cap_info);
 		if (QDF_STATUS_SUCCESS != status) {
 			hdd_err("Failed to get HT capability info");
@@ -4178,7 +4178,7 @@ static int __iw_setint_getnone(struct net_device *dev,
 		if (!mac_handle)
 			return -EINVAL;
 
-		if (ucfg_mlme_set_assoc_sta_limit(hdd_ctx->hdd_psoc, set_value)
+		if (ucfg_mlme_set_assoc_sta_limit(hdd_ctx->psoc, set_value)
 			   != QDF_STATUS_SUCCESS) {
 			hdd_err("CFG_ASSOC_STA_LIMIT failed");
 			ret = -EIO;
@@ -5527,7 +5527,7 @@ static int __iw_setnone_getint(struct net_device *dev,
 	}
 	case WE_GET_MAX_ASSOC:
 	{
-		if (ucfg_mlme_set_assoc_sta_limit(hdd_ctx->hdd_psoc, *value) !=
+		if (ucfg_mlme_set_assoc_sta_limit(hdd_ctx->psoc, *value) !=
 		    QDF_STATUS_SUCCESS) {
 			hdd_err("CFG_ASSOC_STA_LIMIT failed");
 			ret = -EIO;
@@ -5538,7 +5538,7 @@ static int __iw_setnone_getint(struct net_device *dev,
 
 	case WE_GET_CONCURRENCY_MODE:
 	{
-		*value = policy_mgr_get_concurrency_mode(hdd_ctx->hdd_psoc);
+		*value = policy_mgr_get_concurrency_mode(hdd_ctx->psoc);
 
 		hdd_debug("concurrency mode=%d", *value);
 		break;
@@ -5548,7 +5548,7 @@ static int __iw_setnone_getint(struct net_device *dev,
 	{
 		sme_get_config_param(mac_handle, sme_config);
 		*value = (sme_config->csrConfig.enable2x2 == 0) ? 1 : 2;
-		if (policy_mgr_is_current_hwmode_dbs(hdd_ctx->hdd_psoc))
+		if (policy_mgr_is_current_hwmode_dbs(hdd_ctx->psoc))
 			*value = *value - 1;
 		hdd_debug("GET_NSS: Current NSS:%d", *value);
 		break;
@@ -6069,7 +6069,7 @@ static int __iw_set_three_ints_getnone(struct net_device *dev,
 			return -EPERM;
 		}
 		hdd_debug("%d %d %d", value[1], value[2], value[3]);
-		policy_mgr_set_dual_mac_scan_config(hdd_ctx->hdd_psoc,
+		policy_mgr_set_dual_mac_scan_config(hdd_ctx->psoc,
 			value[1], value[2], value[3]);
 		break;
 	case WE_SET_FW_TEST:
@@ -6149,7 +6149,7 @@ static inline int iw_get_oem_data_cap_wrapper(struct net_device *dev,
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
-	return os_if_wifi_pos_populate_caps(hdd_ctx->hdd_psoc,
+	return os_if_wifi_pos_populate_caps(hdd_ctx->psoc,
 					(struct wifi_pos_driver_caps *)extra);
 }
 #else
@@ -6887,7 +6887,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
 			hdd_err("Invalid input params received for the IOCTL");
 			return 0;
 		}
-		policy_mgr_incr_connection_count_utfw(hdd_ctx->hdd_psoc,
+		policy_mgr_incr_connection_count_utfw(hdd_ctx->psoc,
 			apps_args[0], apps_args[1], apps_args[2], apps_args[3],
 			apps_args[4], apps_args[5], apps_args[6], apps_args[7]);
 	}
@@ -6900,7 +6900,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
 			hdd_err("Invalid input params received for the IOCTL");
 			return 0;
 		}
-		policy_mgr_decr_connection_count_utfw(hdd_ctx->hdd_psoc,
+		policy_mgr_decr_connection_count_utfw(hdd_ctx->psoc,
 			apps_args[0], apps_args[1]);
 	}
 	break;
@@ -6915,7 +6915,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
 			hdd_err("Invalid input params received for the IOCTL");
 			return 0;
 		}
-		policy_mgr_update_connection_info_utfw(hdd_ctx->hdd_psoc,
+		policy_mgr_update_connection_info_utfw(hdd_ctx->psoc,
 			apps_args[0], apps_args[1], apps_args[2], apps_args[3],
 			apps_args[4], apps_args[5], apps_args[6], apps_args[7]);
 	}
@@ -6949,7 +6949,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
 			hdd_err("Invalid input param received for the IOCTL");
 			return 0;
 		}
-		policy_mgr_get_pcl(hdd_ctx->hdd_psoc, apps_args[0],
+		policy_mgr_get_pcl(hdd_ctx->psoc, apps_args[0],
 				pcl, &pcl_len,
 				weight_list, QDF_ARRAY_SIZE(weight_list));
 		pr_info("PCL list for role[%d] is {", apps_args[0]);
@@ -6963,7 +6963,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
 	{
 		if (apps_args[0] == 0) {
 			hdd_err("set hw mode for single mac");
-			policy_mgr_pdev_set_hw_mode(hdd_ctx->hdd_psoc,
+			policy_mgr_pdev_set_hw_mode(hdd_ctx->psoc,
 					adapter->session_id,
 					HW_MODE_SS_2x2,
 					HW_MODE_80_MHZ,
@@ -6975,7 +6975,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
 					POLICY_MGR_UPDATE_REASON_UT, PM_NOP);
 		} else if (apps_args[0] == 1) {
 			hdd_err("set hw mode for dual mac");
-			policy_mgr_pdev_set_hw_mode(hdd_ctx->hdd_psoc,
+			policy_mgr_pdev_set_hw_mode(hdd_ctx->psoc,
 					adapter->session_id,
 					HW_MODE_SS_1x1,
 					HW_MODE_80_MHZ,
@@ -6997,7 +6997,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
 			return 0;
 		}
 		policy_mgr_current_connections_update(
-			hdd_ctx->hdd_psoc,
+			hdd_ctx->psoc,
 			adapter->session_id, apps_args[0],
 			POLICY_MGR_UPDATE_REASON_UT);
 	}
@@ -7013,7 +7013,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
 			hdd_err("Invalid input params received for the IOCTL");
 			return 0;
 		}
-		allow = policy_mgr_allow_concurrency(hdd_ctx->hdd_psoc,
+		allow = policy_mgr_allow_concurrency(hdd_ctx->psoc,
 				apps_args[0], apps_args[1], apps_args[2]);
 		pr_info("allow %d {0 = don't allow, 1 = allow}", allow);
 	}
@@ -7106,7 +7106,7 @@ static void hdd_ch_avoid_unit_cmd(struct hdd_context *hdd_ctx,
 		cnt++;
 	}
 	ch_avoid.ch_avoid_range_cnt = cnt;
-	ucfg_reg_unit_simulate_ch_avoid(hdd_ctx->hdd_psoc, &ch_avoid);
+	ucfg_reg_unit_simulate_ch_avoid(hdd_ctx->psoc, &ch_avoid);
 }
 #else
 static void hdd_ch_avoid_unit_cmd(struct hdd_context *hdd_ctx,
@@ -8999,7 +8999,7 @@ static int __iw_set_two_ints_getnone(struct net_device *dev,
 			return -EPERM;
 		}
 		hdd_debug("%d %d", value[1], value[2]);
-		policy_mgr_set_dual_mac_fw_mode_config(hdd_ctx->hdd_psoc,
+		policy_mgr_set_dual_mac_fw_mode_config(hdd_ctx->psoc,
 			value[1], value[2]);
 		break;
 	case WE_DUMP_DP_TRACE_LEVEL:

core/hdd/src/wlan_hdd_wowl.c

@@ -77,13 +77,13 @@ static QDF_STATUS
 hdd_get_num_wow_filters(struct hdd_context *hdd_ctx, uint8_t *num_filters)
 {
 	QDF_STATUS status;
-	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
+	struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;
 
 	status = wlan_objmgr_psoc_try_get_ref(psoc, WLAN_HDD_ID_OBJ_MGR);
 	if (QDF_IS_STATUS_ERROR(status))
 		return status;
 
-	*num_filters = ucfg_pmo_get_num_wow_filters(hdd_ctx->hdd_psoc);
+	*num_filters = ucfg_pmo_get_num_wow_filters(hdd_ctx->psoc);
 
 	wlan_objmgr_psoc_release_ref(psoc, WLAN_HDD_ID_OBJ_MGR);