qcacmn: Remove psoc/pdev locks for trivial APIs

Remove psoc/pdev locks from trivial API's. This follows the changes from
which the lock requirement from few simple APIs are removed.

Change-Id: Ib5769c2234c8d57f485c0eef5a4e3c61fa170508
CRs-Fixed: 2060880

os_if/linux/scan/src/wlan_cfg80211_scan.c

@@ -143,9 +143,7 @@ static void wlan_cfg80211_pno_callback(struct wlan_objmgr_vdev *vdev,
 		return;
 	}
 
-	wlan_pdev_obj_lock(pdev);
 	pdev_ospriv = wlan_pdev_get_ospriv(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!pdev_ospriv) {
 		cfg80211_err("pdev_ospriv is NULL");
 		return;
@@ -420,6 +418,7 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_pdev *pdev,
 		req->fast_scan_period, req->fast_scan_max_cycles,
 		req->slow_scan_period);
 
+	psoc = wlan_pdev_get_psoc(pdev);
 	ucfg_scan_register_pno_cb(psoc,
 		wlan_cfg80211_pno_callback, NULL);
 	ucfg_scan_get_pno_def_params(vdev, req);
@@ -863,9 +862,7 @@ QDF_STATUS wlan_cfg80211_scan_priv_init(struct wlan_objmgr_pdev *pdev)
 	struct wlan_objmgr_psoc *psoc;
 	wlan_scan_requester req_id;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	req_id = ucfg_scan_register_requester(psoc, "CFG",
 		wlan_cfg80211_scan_done_callback, NULL);
@@ -892,10 +889,8 @@ QDF_STATUS wlan_cfg80211_scan_priv_deinit(struct wlan_objmgr_pdev *pdev)
 	struct osif_scan_pdev *scan_priv;
 	struct wlan_objmgr_psoc *psoc;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
 	osif_priv = wlan_pdev_get_ospriv(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	scan_priv = osif_priv->osif_scan;
 	osif_priv->osif_scan = NULL;
@@ -922,9 +917,7 @@ void wlan_cfg80211_cleanup_scan_queue(struct wlan_objmgr_pdev *pdev)
 		return;
 	}
 
-	wlan_pdev_obj_lock(pdev);
 	osif_priv = wlan_pdev_get_ospriv(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	scan_priv = osif_priv->osif_scan;
 	qdf_mutex_acquire(&scan_priv->scan_req_q_lock);

pmo/core/inc/wlan_pmo_objmgr.h

@@ -141,9 +141,7 @@ pmo_psoc_get_priv(struct wlan_objmgr_psoc *psoc)
 {
 	struct pmo_psoc_priv_obj *psoc_priv;
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv = pmo_psoc_get_priv_nolock(psoc);
-	wlan_psoc_obj_unlock(psoc);
 
 	QDF_BUG(psoc_priv);
 
@@ -157,9 +155,7 @@ pmo_pdev_get_psoc(struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_objmgr_psoc *psoc;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	QDF_BUG(psoc);
 

target_if/dfs/src/target_if_dfs.c

@@ -180,9 +180,7 @@ static QDF_STATUS target_if_dfs_register_event_handler(
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct wlan_objmgr_psoc *psoc = NULL;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		target_if_err("null psoc");
 		return QDF_STATUS_E_FAILURE;

target_if/son/src/target_if_son.c

@@ -91,9 +91,7 @@ QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev,
 	struct stats_request_params param = {0};
 	struct wlan_objmgr_psoc *psoc = NULL;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	if( !psoc)
 		return QDF_STATUS_E_FAILURE;

umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h

@@ -432,7 +432,6 @@ static inline void wlan_pdev_obj_unlock(struct wlan_objmgr_pdev *pdev)
 static inline struct wlan_objmgr_psoc *wlan_pdev_get_psoc(
 			struct wlan_objmgr_pdev *pdev)
 {
-	/* This API is invoked with lock acquired, do not add log prints */
 	return pdev->pdev_objmgr.wlan_psoc;
 }
 
@@ -598,7 +597,6 @@ static inline void wlan_pdev_set_hw_macaddr(struct wlan_objmgr_pdev *pdev,
 static inline struct pdev_osif_priv *wlan_pdev_get_ospriv(
 				struct wlan_objmgr_pdev *pdev)
 {
-	/* This API is invoked with lock acquired, do not add log prints */
 	return pdev->pdev_nif.pdev_ospriv;
 }
 
@@ -735,7 +733,6 @@ void wlan_objmgr_pdev_release_ref(struct wlan_objmgr_pdev *pdev,
 static inline
 uint8_t wlan_objmgr_pdev_get_pdev_id(struct wlan_objmgr_pdev *pdev)
 {
-	/* This API is invoked with lock acquired, do not add log prints */
 	return pdev->pdev_objmgr.wlan_pdev_id;
 }
 

umac/cmn_services/obj_mgr/src/wlan_objmgr_pdev_obj.c

@@ -775,8 +775,6 @@ void *wlan_objmgr_pdev_get_comp_private_obj(
 {
 	void *comp_priv_obj;
 
-	/* This API is invoked with lock acquired, don't add any debug prints */
-
 	/* component id is invalid */
 	if (id >= WLAN_UMAC_MAX_COMPONENTS) {
 		QDF_BUG(0);

umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj.c

@@ -1609,8 +1609,6 @@ void *wlan_objmgr_psoc_get_comp_private_obj(struct wlan_objmgr_psoc *psoc,
 {
 	void *comp_private_obj;
 
-	/* This API is invoked with lock acquired, don't add any debug prints */
-
 	/* component id is invalid */
 	if (id >= WLAN_UMAC_MAX_COMPONENTS) {
 		QDF_BUG(0);

umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c

@@ -687,8 +687,6 @@ void *wlan_objmgr_vdev_get_comp_private_obj(
 {
 	void *comp_priv_obj;
 
-	/* This API is invoked with lock acquired, don't add any debug prints */
-
 	/* component id is invalid */
 	if (id >= WLAN_UMAC_MAX_COMPONENTS) {
 		QDF_BUG(0);

umac/cmn_services/serialization/src/wlan_serialization_utils.c

@@ -509,10 +509,8 @@ struct wlan_serialization_psoc_priv_obj *wlan_serialization_get_psoc_priv_obj(
 		struct wlan_objmgr_psoc *psoc)
 {
 	struct wlan_serialization_psoc_priv_obj *ser_soc_obj;
-	wlan_psoc_obj_lock(psoc);
 	ser_soc_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 					WLAN_UMAC_COMP_SERIALIZATION);
-	wlan_psoc_obj_unlock(psoc);
 
 	return ser_soc_obj;
 }
@@ -521,10 +519,8 @@ struct wlan_serialization_pdev_priv_obj *wlan_serialization_get_pdev_priv_obj(
 		struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_serialization_pdev_priv_obj *obj;
-	wlan_pdev_obj_lock(pdev);
 	obj = wlan_objmgr_pdev_get_comp_private_obj(pdev,
 					WLAN_UMAC_COMP_SERIALIZATION);
-	wlan_pdev_obj_unlock(pdev);
 
 	return obj;
 }

umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c

@@ -37,10 +37,8 @@ struct dfs_to_mlme global_dfs_to_mlme;
 struct wlan_dfs *wlan_pdev_get_dfs_obj(struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_dfs *dfs;
-	wlan_pdev_obj_lock(pdev);
 	dfs = wlan_objmgr_pdev_get_comp_private_obj(pdev,
 			WLAN_UMAC_COMP_DFS);
-	wlan_pdev_obj_unlock(pdev);
 
 	return dfs;
 }
@@ -158,9 +156,7 @@ QDF_STATUS wlan_dfs_pdev_obj_create_notification(struct wlan_objmgr_pdev *pdev,
 	global_dfs_to_mlme.pdev_component_obj_attach(pdev,
 		WLAN_UMAC_COMP_DFS, (void *)dfs, QDF_STATUS_SUCCESS);
 	dfs->dfs_pdev_obj = pdev;
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		DFS_PRINTK("%s: null psoc\n", __func__);
 		return QDF_STATUS_E_FAILURE;

umac/dfs/dispatcher/src/wlan_dfs_lmac_api.c

@@ -39,9 +39,7 @@ void lmac_get_caps(struct wlan_objmgr_pdev *pdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -64,9 +62,7 @@ uint64_t lmac_get_tsf64(struct wlan_objmgr_pdev *pdev)
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 	uint64_t tsf64 = 0;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -81,9 +77,7 @@ void lmac_dfs_disable(struct wlan_objmgr_pdev *pdev, int no_cac)
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -96,9 +90,7 @@ int lmac_get_dfsdomain(struct wlan_objmgr_pdev *pdev)
 	struct wlan_objmgr_psoc *psoc;
 	enum dfs_reg dfsdomain;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	wlan_reg_get_dfs_region(psoc, &dfsdomain);
 
@@ -120,9 +112,7 @@ void lmac_dfs_enable(struct wlan_objmgr_pdev *pdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -153,9 +143,7 @@ void lmac_dfs_get_thresholds(struct wlan_objmgr_pdev *pdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -177,9 +165,7 @@ bool lmac_is_mode_offload(struct wlan_objmgr_pdev *pdev)
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 	bool is_offload = false;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -195,9 +181,7 @@ uint16_t lmac_get_ah_devid(struct wlan_objmgr_pdev *pdev)
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 	uint16_t devid = 0;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -213,9 +197,7 @@ uint32_t lmac_get_ext_busy(struct wlan_objmgr_pdev *pdev)
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 	uint32_t ext_chan_busy = 0;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -231,9 +213,7 @@ bool lmac_is_countryCode_KOREA_ROC3(struct wlan_objmgr_pdev *pdev)
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 	bool ctry_korea = false;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -250,9 +230,7 @@ void lmac_set_use_cac_prssi(struct wlan_objmgr_pdev *pdev)
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -266,9 +244,7 @@ uint32_t lmac_get_target_type(struct wlan_objmgr_pdev *pdev)
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 	uint32_t target_type = 0;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -284,9 +260,7 @@ bool lmac_is_countryCode_CHINA(struct wlan_objmgr_pdev *pdev)
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 	bool country_china = false;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 
@@ -303,9 +277,7 @@ uint32_t lmac_get_phymode_info(struct wlan_objmgr_pdev *pdev,
 	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
 	uint32_t mode_info = 0;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops;
 

umac/dfs/dispatcher/src/wlan_dfs_utils_api.c

@@ -437,9 +437,7 @@ static void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
 	struct wlan_objmgr_psoc *psoc;
 	uint32_t conn_count = 0;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		*num_chan = 0;
 		DFS_PRINTK("%s: null psoc\n", __func__);
@@ -491,9 +489,7 @@ QDF_STATUS dfs_get_random_channel(
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
 	*target_chan = 0;
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		DFS_PRINTK("%s: null psoc\n", __func__);
 		goto random_chan_error;
@@ -564,9 +560,7 @@ void dfs_init_nol(struct wlan_objmgr_pdev *pdev)
 	int len;
 
 	dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!dfs || !psoc) {
 		DFS_PRINTK("%s: dfs %p, psoc %p\n", __func__, dfs, psoc);
 		return;
@@ -611,9 +605,7 @@ void dfs_save_nol(struct wlan_objmgr_pdev *pdev)
 		return;
 	}
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		DFS_PRINTK("%s: null psoc\n", __func__);
 		return;

umac/nan/core/src/nan_main.c

@@ -57,9 +57,7 @@ struct nan_psoc_priv_obj *nan_get_psoc_priv_obj(
 		nan_err("psoc is null");
 		return NULL;
 	}
-	wlan_psoc_obj_lock(psoc);
 	obj = wlan_objmgr_psoc_get_comp_private_obj(psoc, WLAN_UMAC_COMP_NAN);
-	wlan_psoc_obj_unlock(psoc);
 
 	return obj;
 }

umac/regulatory/core/src/reg_services.c

@@ -1784,11 +1784,9 @@ static void reg_propagate_mas_chan_list_to_pdev(struct wlan_objmgr_psoc *psoc,
 	enum direction *dir = arg;
 	struct wlan_lmac_if_reg_tx_ops *reg_tx_ops;
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = (struct wlan_regulatory_psoc_priv_obj *)
 		wlan_objmgr_psoc_get_comp_private_obj(psoc,
 				       WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("psoc priv obj is NULL");
@@ -2059,10 +2057,8 @@ QDF_STATUS wlan_regulatory_psoc_obj_destroyed_notification(
 	QDF_STATUS status;
 	struct wlan_regulatory_psoc_priv_obj *soc_reg;
 
-	wlan_psoc_obj_lock(psoc);
 	soc_reg = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 				     WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == soc_reg) {
 		reg_err("reg psoc private obj is NULL");
@@ -2252,11 +2248,9 @@ QDF_STATUS wlan_regulatory_pdev_obj_created_notification(
 	parent_psoc = wlan_pdev_get_psoc(pdev);
 	pdev_id = wlan_objmgr_pdev_get_pdev_id(pdev);
 
-	wlan_psoc_obj_lock(parent_psoc);
 	psoc_priv_obj = (struct wlan_regulatory_psoc_priv_obj *)
 		wlan_objmgr_psoc_get_comp_private_obj(parent_psoc,
 				     WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(parent_psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("reg psoc private obj is NULL");
@@ -2539,10 +2533,8 @@ void reg_update_nol_ch(struct wlan_objmgr_pdev *pdev,
 
 	psoc = wlan_pdev_get_psoc(pdev);
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 						  WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("reg psoc private obj is NULL");
@@ -2580,11 +2572,9 @@ static void reg_change_pdev_for_config(struct wlan_objmgr_psoc *psoc,
 	struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj;
 	struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = (struct wlan_regulatory_psoc_priv_obj *)
 		wlan_objmgr_psoc_get_comp_private_obj(psoc,
 					     WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("psoc priv obj is NULL");
@@ -2618,11 +2608,9 @@ QDF_STATUS reg_set_config_vars(struct wlan_objmgr_psoc *psoc,
 	struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj;
 	QDF_STATUS status;
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = (struct wlan_regulatory_psoc_priv_obj *)
 		wlan_objmgr_psoc_get_comp_private_obj(psoc,
 				       WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("psoc priv obj is NULL");
@@ -2665,10 +2653,8 @@ bool reg_is_regdb_offloaded(struct wlan_objmgr_psoc *psoc)
 {
 	struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj;
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 					WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("reg psoc private obj is NULL");
@@ -2689,10 +2675,8 @@ void reg_program_mas_chan_list(struct wlan_objmgr_psoc *psoc,
 	uint32_t count;
 	enum direction dir;
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 					WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("reg psoc private obj is NULL");
@@ -2736,10 +2720,8 @@ void reg_register_chan_change_callback(struct wlan_objmgr_psoc *psoc,
 	uint32_t count;
 
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 					WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("reg psoc private obj is NULL");
@@ -2766,10 +2748,8 @@ void reg_unregister_chan_change_callback(struct wlan_objmgr_psoc *psoc,
 	struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj;
 	uint32_t count;
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 					WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("reg psoc private obj is NULL");
@@ -2794,10 +2774,8 @@ enum country_src reg_get_cc_and_src(struct wlan_objmgr_psoc *psoc,
 {
 	struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj;
 
-	wlan_psoc_obj_lock(psoc);
 	psoc_priv_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 					WLAN_UMAC_COMP_REGULATORY);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (NULL == psoc_priv_obj) {
 		reg_err("reg psoc private obj is NULL");

umac/scan/core/src/wlan_scan_cache_db.c

@@ -790,9 +790,7 @@ qdf_list_t *scm_get_scan_result(struct wlan_objmgr_pdev *pdev,
 		return NULL;
 	}
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		scm_err("psoc is NULL");
 		return NULL;
@@ -875,9 +873,7 @@ scm_iterate_scan_db(struct wlan_objmgr_pdev *pdev,
 		return QDF_STATUS_E_INVAL;
 	}
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		scm_err("psoc is NULL");
 		return QDF_STATUS_E_INVAL;
@@ -968,9 +964,7 @@ QDF_STATUS scm_flush_results(struct wlan_objmgr_pdev *pdev,
 		return QDF_STATUS_E_INVAL;
 	}
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		scm_err("psoc is NULL");
 		return QDF_STATUS_E_INVAL;
@@ -1032,9 +1026,7 @@ void scm_filter_valid_channel(struct wlan_objmgr_pdev *pdev,
 		return;
 	}
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	if (!psoc) {
 		scm_err("psoc is NULL");
 		return;

umac/scan/core/src/wlan_scan_cache_db_i.h

@@ -162,9 +162,7 @@ wlan_pdev_get_scan_db(struct wlan_objmgr_psoc *psoc,
 		scm_err("pdev is NULL");
 		return NULL;
 	}
-	wlan_pdev_obj_lock(pdev);
 	pdev_id = wlan_objmgr_pdev_get_pdev_id(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	return wlan_pdevid_get_scan_db(psoc, pdev_id);
 }

umac/scan/core/src/wlan_scan_main.c

@@ -54,10 +54,8 @@ QDF_STATUS wlan_scan_psoc_destroyed_notification(
 	void *scan_obj = NULL;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	wlan_psoc_obj_lock(psoc);
 	scan_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 			WLAN_UMAC_COMP_SCAN);
-	wlan_psoc_obj_unlock(psoc);
 
 	if (!scan_obj) {
 		scm_err("Failed to detach scan in psoc ctx");

umac/scan/core/src/wlan_scan_main.h

@@ -374,11 +374,9 @@ wlan_psoc_get_scan_obj(struct wlan_objmgr_psoc *psoc)
 {
 	struct wlan_scan_obj *scan_obj;
 
-	wlan_psoc_obj_lock(psoc);
 	scan_obj = (struct wlan_scan_obj *)
 		wlan_objmgr_psoc_get_comp_private_obj(psoc,
 				WLAN_UMAC_COMP_SCAN);
-	wlan_psoc_obj_unlock(psoc);
 
 	return scan_obj;
 }
@@ -394,9 +392,7 @@ wlan_pdev_get_scan_obj(struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_objmgr_psoc *psoc;
 
-	wlan_pdev_obj_lock(pdev);
 	psoc = wlan_pdev_get_psoc(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	return wlan_psoc_get_scan_obj(psoc);
 }
@@ -471,9 +467,7 @@ wlan_pdev_get_pdev_scan_ev_handlers(struct wlan_objmgr_pdev *pdev)
 	struct wlan_scan_obj *scan;
 	struct pdev_scan_ev_handler *pdev_ev_handler;
 
-	wlan_pdev_obj_lock(pdev);
 	pdevid = wlan_objmgr_pdev_get_pdev_id(pdev);
-	wlan_pdev_obj_unlock(pdev);
 
 	scan = wlan_pdev_get_scan_obj(pdev);
 

umac/scan/dispatcher/src/wlan_scan_ucfg_api.c

@@ -1097,9 +1097,7 @@ ucfg_scan_cancel_pdev_scan(struct wlan_objmgr_pdev *pdev)
 	}
 	req->vdev = vdev;
 	req->cancel_req.scan_id = INVAL_SCAN_ID;
-	wlan_pdev_obj_lock(pdev);
 	req->cancel_req.pdev_id = wlan_objmgr_pdev_get_pdev_id(pdev);
-	wlan_pdev_obj_unlock(pdev);
 	req->cancel_req.vdev_id = INVAL_VDEV_ID;
 	req->cancel_req.req_type = WLAN_SCAN_CANCEL_PDEV_ALL;
 	status = ucfg_scan_cancel_sync(req);

umac/tdls/core/src/wlan_tdls_main.h

@@ -383,11 +383,9 @@ wlan_vdev_get_tdls_soc_obj(struct wlan_objmgr_vdev *vdev)
 		return NULL;
 	}
 
-	wlan_psoc_obj_lock(psoc);
 	soc_obj = (struct tdls_soc_priv_obj *)
 		wlan_objmgr_psoc_get_comp_private_obj(psoc,
 						      WLAN_UMAC_COMP_TDLS);
-	wlan_psoc_obj_unlock(psoc);
 
 	return soc_obj;
 }
@@ -406,11 +404,9 @@ wlan_psoc_get_tdls_soc_obj(struct wlan_objmgr_psoc *psoc)
 		tdls_err("NULL psoc");
 		return NULL;
 	}
-	wlan_psoc_obj_lock(psoc);
 	soc_obj = (struct tdls_soc_priv_obj *)
 		wlan_objmgr_psoc_get_comp_private_obj(psoc,
 						      WLAN_UMAC_COMP_TDLS);
-	wlan_psoc_obj_unlock(psoc);
 
 	return soc_obj;
 }

umac/wifi_pos/src/wifi_pos_utils.c

@@ -67,10 +67,8 @@ struct wifi_pos_psoc_priv_obj *wifi_pos_get_psoc_priv_obj(
 {
 	struct wifi_pos_psoc_priv_obj *obj;
 
-	wlan_psoc_obj_lock(psoc);
 	obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
 						    WLAN_UMAC_COMP_WIFI_POS);
-	wlan_psoc_obj_unlock(psoc);
 
 	return obj;
 }