qcacmn: Rename variable for readability

Rename instance of comp_obj referred in code to comp_priv_obj,
as these instances are private to individual components

Change-Id: I895362261e5b7e06a46c2bd92942a972c75f192b
CRs-Fixed: 1096009

umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h

@@ -153,7 +153,7 @@ struct wlan_objmgr_pdev_objmgr {
  * @pdev_nif:          pdev nif structure
  * @pdev_objmgr:       pdev object manager structure
  * @pdev_mlme:         pdev MLME structure
- * @pdev_comp_obj[]:   component objects array
+ * @pdev_comp_priv_obj[]:   component's private object array
  * @obj_status[]:      object status of each component object
  * @obj_state:         object state
  * @pdev_lock:         lock to protect object
@@ -163,7 +163,7 @@ struct wlan_objmgr_pdev {
 	struct wlan_objmgr_pdev_nif  pdev_nif;
 	struct wlan_objmgr_pdev_objmgr pdev_objmgr;
 	struct wlan_objmgr_pdev_mlme   pdev_mlme;
-	void *pdev_comp_obj[WLAN_UMAC_MAX_COMPONENTS];
+	void *pdev_comp_priv_obj[WLAN_UMAC_MAX_COMPONENTS];
 	QDF_STATUS obj_status[WLAN_UMAC_MAX_COMPONENTS];
 	WLAN_OBJ_STATE obj_state;
 	qdf_spinlock_t pdev_lock;
@@ -206,7 +206,7 @@ QDF_STATUS wlan_objmgr_pdev_obj_delete(struct wlan_objmgr_pdev *pdev);
  * wlan_objmgr_pdev_component_obj_attach() - pdev comp object attach
  * @psoc: PDEV object
  * @id: Component id
- * @comp_objptr: component's private object pointer
+ * @comp_priv_obj: component's private object pointer
  * @status: Component's private object creation status
  *
  * API to be used for attaching component object with PDEV common object
@@ -217,14 +217,14 @@ QDF_STATUS wlan_objmgr_pdev_obj_delete(struct wlan_objmgr_pdev *pdev);
 QDF_STATUS wlan_objmgr_pdev_component_obj_attach(
 		struct wlan_objmgr_pdev *pdev,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr,
+		void *comp_priv_obj,
 		QDF_STATUS status);
 
 /**
  * wlan_objmgr_pdev_component_obj_detach() - pdev comp object detach
  * @psoc: PDEV object
  * @id: Component id
- * @comp_objptr: component's private object pointer
+ * @comp_priv_obj: component's private object pointer
  *
  * API to be used for detaching component object with PDEV common object
  *
@@ -235,7 +235,7 @@ QDF_STATUS wlan_objmgr_pdev_component_obj_attach(
 QDF_STATUS wlan_objmgr_pdev_component_obj_detach(
 		struct wlan_objmgr_pdev *pdev,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr);
+		void *comp_priv_obj);
 
 /**
  ** APIs to operations on pdev objects
@@ -269,32 +269,34 @@ QDF_STATUS wlan_objmgr_pdev_iterate_obj_list(
 		void *arg, uint8_t lock_free_op);
 
 /**
- * wlan_objmgr_trigger_pdev_comp_object_creation() - create comp object of pdev
+ * wlan_objmgr_trigger_pdev_comp_priv_object_creation() - create
+ * comp object of pdev
  * @pdev: PDEV object
  * @id: Component id
  *
- * API to create component object in run time, this would be used for features
- * which gets enabled in run time
+ * API to create component private object in run time, this would be
+ * used for features which gets enabled in run time
  *
  * Return: SUCCESS on successful creation
  *         On FAILURE (appropriate failure codes are returned)
  */
-QDF_STATUS wlan_objmgr_trigger_pdev_comp_object_creation(
+QDF_STATUS wlan_objmgr_trigger_pdev_comp_priv_object_creation(
 		struct wlan_objmgr_pdev *pdev,
 		enum wlan_umac_comp_id id);
 
 /**
- * wlan_objmgr_trigger_pdev_comp_object_deletion() - delete comp object of pdev
+ * wlan_objmgr_trigger_pdev_comp_priv_object_deletion() - delete
+ * comp object of pdev
  * @pdev: PDEV object
  * @id: Component id
  *
- * API to delete component object in run time, this would be used for features
- * which gets disabled in run time
+ * API to delete component private object in run time, this would
+ * be used for features which gets disabled in run time
  *
  * Return: SUCCESS on successful deletion
  *         On FAILURE (appropriate failure codes are returned)
  */
-QDF_STATUS wlan_objmgr_trigger_pdev_comp_object_deletion(
+QDF_STATUS wlan_objmgr_trigger_pdev_comp_priv_object_deletion(
 		struct wlan_objmgr_pdev *pdev,
 		enum wlan_umac_comp_id id);
 

umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h

@@ -158,7 +158,7 @@ struct wlan_peer_activity {  /*TODO */
  * @peer_mlme:	      Peer MLME common structure
  * @peer_activity:    peer activity
  * @peer_objmgr:      Peer Object manager common structure
- * @peer_comp_obj[]:  Component object pointers
+ * @peer_comp_priv_obj[]:  Component's private object pointers
  * @obj_status[]:     status of each component object
  * @obj_state:        Status of Peer object
  * @peer_lock:        Lock for access/update peer contents
@@ -170,7 +170,7 @@ struct wlan_objmgr_peer {
 	struct wlan_objmgr_peer_mlme peer_mlme;
 	struct wlan_peer_activity peer_activity;
 	struct wlan_objmgr_peer_objmgr peer_objmgr;
-	void *peer_comp_obj[WLAN_UMAC_MAX_COMPONENTS];
+	void *peer_comp_priv_obj[WLAN_UMAC_MAX_COMPONENTS];
 	QDF_STATUS obj_status[WLAN_UMAC_MAX_COMPONENTS];
 	WLAN_OBJ_STATE obj_state;
 	qdf_spinlock_t peer_lock;
@@ -216,7 +216,7 @@ QDF_STATUS wlan_objmgr_peer_obj_delete(struct wlan_objmgr_peer *peer);
  * wlan_objmgr_peer_component_obj_attach() - attach comp object to peer
  * @peer: PEER object
  * @id: Component id
- * @comp_objptr: component's private object pointer
+ * @comp_priv_obj: component's private object pointer
  * @status: Component's private object creation status
  *
  * API to be used for attaching component object with PEER common object
@@ -227,14 +227,14 @@ QDF_STATUS wlan_objmgr_peer_obj_delete(struct wlan_objmgr_peer *peer);
 QDF_STATUS wlan_objmgr_peer_component_obj_attach(
 		struct wlan_objmgr_peer *peer,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr,
+		void *comp_priv_obj,
 		QDF_STATUS status);
 
 /**
  * wlan_objmgr_peer_component_obj_detach() - detach comp object from peer
  * @peer: PEER object
  * @id: Component id
- * @comp_objptr: component's private object pointer
+ * @comp_priv_obj: component's private object pointer
  *
  * API to be used for detaching component object with PEER common object
  *
@@ -245,39 +245,41 @@ QDF_STATUS wlan_objmgr_peer_component_obj_attach(
 QDF_STATUS wlan_objmgr_peer_component_obj_detach(
 		struct wlan_objmgr_peer *peer,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr);
+		void *comp_priv_obj);
 
 /**
  ** APIs to operations on peer objects
  */
 
 /**
- * wlan_objmgr_trigger_peer_comp_object_creation() - create peer comp object
+ * wlan_objmgr_trigger_peer_comp_priv_object_creation() - create
+ * peer comp object
  * @peer: PEER object
  * @id: Component id
  *
- * API to create component object in run time, this would be used for features
- * which gets enabled in run time
+ * API to create component private object in run time, this would
+ * be used for features which gets enabled in run time
  *
  * Return: SUCCESS on successful creation
  *         On FAILURE (appropriate failure codes are returned)
  */
-QDF_STATUS wlan_objmgr_trigger_peer_comp_object_creation(
+QDF_STATUS wlan_objmgr_trigger_peer_comp_priv_object_creation(
 		struct wlan_objmgr_peer *peer,
 		enum wlan_umac_comp_id id);
 
 /**
- * wlan_objmgr_trigger_peer_comp_object_deletion() - delete peer comp object
+ * wlan_objmgr_trigger_peer_comp_priv_object_deletion() - delete
+ * peer comp object
  * @peer: PEER object
  * @id: Component id
  *
- * API to delete component object in run time, this would be used for features
- * which gets disabled in run time
+ * API to delete component private object in run time, this would
+ * be used for features which gets disabled in run time
  *
  * Return: SUCCESS on successful deletion
  *         On FAILURE (appropriate failure codes are returned)
  */
-QDF_STATUS wlan_objmgr_trigger_peer_comp_object_deletion(
+QDF_STATUS wlan_objmgr_trigger_peer_comp_priv_object_deletion(
 		struct wlan_objmgr_peer *peer,
 		enum wlan_umac_comp_id id);
 

umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h

@@ -238,7 +238,7 @@ struct wlan_soc_timer {
  * @soc_timer:             soc timer for inactivity
  * @soc_concurrency:       concurrency info
  * @wlan_active_vdevs[]:   List of active VDEVs
- * @soc_comp_obj[]:        component object pointers
+ * @soc_comp_priv_obj[]:   component private object pointers
  * @obj_status[]:          component object status
  * @obj_state:             object state
  * @psoc_lock:             psoc lock
@@ -251,7 +251,7 @@ struct wlan_objmgr_psoc {
 	struct wlan_soc_timer soc_timer;
 	struct wlan_concurrency_info soc_concurrency; /*TODO */
 	uint8_t wlan_active_vdevs[WLAN_UMAC_PSOC_MAX_VDEVS];
-	void *soc_comp_obj[WLAN_UMAC_MAX_COMPONENTS];
+	void *soc_comp_priv_obj[WLAN_UMAC_MAX_COMPONENTS];
 	QDF_STATUS obj_status[WLAN_UMAC_MAX_COMPONENTS];
 	WLAN_OBJ_STATE obj_state;
 	qdf_spinlock_t psoc_lock;
@@ -294,7 +294,7 @@ QDF_STATUS wlan_objmgr_psoc_obj_delete(struct wlan_objmgr_psoc *psoc);
  * wlan_objmgr_psoc_component_obj_attach() - psoc comp object attach
  * @psoc: PSOC object
  * @id: Component id
- * @comp_objptr: component's private object pointer
+ * @comp_priv_obj: component's private object pointer
  * @status: Component's private object creation status
  *
  * API to be used for attaching component object with PSOC common object
@@ -305,14 +305,14 @@ QDF_STATUS wlan_objmgr_psoc_obj_delete(struct wlan_objmgr_psoc *psoc);
 QDF_STATUS wlan_objmgr_psoc_component_obj_attach(
 		struct wlan_objmgr_psoc *psoc,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr,
+		void *comp_priv_obj,
 		QDF_STATUS status);
 
 /**
  * wlan_objmgr_psoc_component_obj_detach() - psoc comp object detach
  * @psoc: PSOC object
  * @id: Component id
- * @comp_objptr: component's private object pointer
+ * @comp_priv_obj: component's private object pointer
  *
  * API to be used for detaching component object with PSOC common object
  *
@@ -323,7 +323,7 @@ QDF_STATUS wlan_objmgr_psoc_component_obj_attach(
 QDF_STATUS wlan_objmgr_psoc_component_obj_detach(
 		struct wlan_objmgr_psoc *psoc,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr);
+		void *comp_priv_obj);
 
 /**
  ** APIs to operations on psoc objects
@@ -366,32 +366,34 @@ QDF_STATUS wlan_objmgr_free_all_objects_per_psoc(
 		struct wlan_objmgr_psoc *psoc);
 
 /**
- * wlan_objmgr_trigger_psoc_comp_object_creation() - create psoc comp object
+ * wlan_objmgr_trigger_psoc_comp_priv_object_creation() - create
+ * psoc comp object
  * @psoc: PSOC object
  * @id: Component id
  *
- * API to create component object in run time, this would be used for features
- * which gets enabled in run time
+ * API to create component private object in run time, this would
+ * be used for features which gets enabled in run time
  *
  * Return: SUCCESS on successful creation
  *         On FAILURE (appropriate failure codes are returned)
  */
-QDF_STATUS wlan_objmgr_trigger_psoc_comp_object_creation(
+QDF_STATUS wlan_objmgr_trigger_psoc_comp_priv_object_creation(
 		struct wlan_objmgr_psoc *psoc,
 		enum wlan_umac_comp_id id);
 
 /**
- * wlan_objmgr_trigger_psoc_comp_object_deletion() - delete psoc comp object
+ * wlan_objmgr_trigger_psoc_comp_priv_object_deletion() - delete
+ * psoc comp object
  * @psoc: PSOC object
  * @id: Component id
  *
- * API to delete component object in run time, this would be used for features
- * which gets disabled in run time
+ * API to delete component private object in run time, this would
+ * be used for features which gets disabled in run time
  *
  * Return: SUCCESS on successful deletion
  *         On FAILURE (appropriate failure codes are returned)
  */
-QDF_STATUS wlan_objmgr_trigger_psoc_comp_object_deletion(
+QDF_STATUS wlan_objmgr_trigger_psoc_comp_priv_object_deletion(
 		struct wlan_objmgr_psoc *psoc,
 		enum wlan_umac_comp_id id);
 

umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h

@@ -317,7 +317,7 @@ struct wlan_objmgr_vdev_objmgr {
  * @vdev_mlme:      VDEV MLME substructure
  * @vdev_objmgr:    VDEV Object Mgr substructure
  * @vdev_nif:       VDEV HDD substructure
- * @vdev_comp_obj[]:Component objects list
+ * @vdev_comp_priv_obj[]:Component's private objects list
  * @obj_status[]:   Component object status
  * @obj_state:      VDEV object state
  * @vdev_lock:      VDEV lock
@@ -327,7 +327,7 @@ struct wlan_objmgr_vdev {
 	struct wlan_objmgr_vdev_mlme vdev_mlme;
 	struct wlan_objmgr_vdev_objmgr vdev_objmgr;
 	struct wlan_objmgr_vdev_nif vdev_nif;
-	void *vdev_comp_obj[WLAN_UMAC_MAX_COMPONENTS];
+	void *vdev_comp_priv_obj[WLAN_UMAC_MAX_COMPONENTS];
 	QDF_STATUS obj_status[WLAN_UMAC_MAX_COMPONENTS];
 	WLAN_OBJ_STATE obj_state;
 	qdf_spinlock_t vdev_lock;
@@ -371,7 +371,7 @@ QDF_STATUS wlan_objmgr_vdev_obj_delete(struct wlan_objmgr_vdev *vdev);
  * wlan_objmgr_vdev_component_obj_attach() - vdev comp object attach
  * @vdev: VDEV object
  * @id: Component id
- * @comp_objptr: component's private object pointer
+ * @comp_priv_obj: component's private object pointer
  * @status: Component's private object creation status
  *
  * API to be used for attaching component object with VDEV common object
@@ -382,14 +382,14 @@ QDF_STATUS wlan_objmgr_vdev_obj_delete(struct wlan_objmgr_vdev *vdev);
 QDF_STATUS wlan_objmgr_vdev_component_obj_attach(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr,
+		void *comp_priv_obj,
 		QDF_STATUS status);
 
 /**
  * wlan_objmgr_vdev_component_obj_detach() - vdev comp object detach
  * @vdev: VDEV object
  * @id: Component id
- * @comp_objptr: component's private object pointer
+ * @comp_priv_obj: component's private object pointer
  *
  * API to be used for detaching component object with VDEV common object
  *
@@ -400,7 +400,7 @@ QDF_STATUS wlan_objmgr_vdev_component_obj_attach(
 QDF_STATUS wlan_objmgr_vdev_component_obj_detach(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr);
+		void *comp_priv_obj);
 /*
  ** APIs to operations on vdev objects
 */
@@ -427,32 +427,34 @@ QDF_STATUS wlan_objmgr_iterate_peerobj_list(
 		void *arg);
 
 /**
- * wlan_objmgr_trigger_vdev_comp_object_creation() - vdev comp object creation
+ * wlan_objmgr_trigger_vdev_comp_priv_object_creation() - vdev
+ * comp object creation
  * @vdev: VDEV object
  * @id: Component id
  *
- * API to create component object in run time, this would be used for features
- * which gets enabled in run time
+ * API to create component private object in run time, this would
+ * be used for features which gets enabled in run time
  *
  * Return: SUCCESS on successful creation
  *         On FAILURE (appropriate failure codes are returned)
  */
-QDF_STATUS wlan_objmgr_trigger_vdev_comp_object_creation(
+QDF_STATUS wlan_objmgr_trigger_vdev_comp_priv_object_creation(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id);
 
 /**
- * wlan_objmgr_trigger_vdev_comp_object_deletion() - vdev comp object deletion
+ * wlan_objmgr_trigger_vdev_comp_priv_object_deletion() - vdev
+ * comp object deletion
  * @vdev: VDEV object
  * @id: Component id
  *
- * API to delete component object in run time, this would be used for features
- * which gets disabled in run time
+ * API to delete component private object in run time, this would
+ * be used for features which gets disabled in run time
  *
  * Return: SUCCESS on successful deletion
  *         On FAILURE (appropriate failure codes are returned)
  */
-QDF_STATUS wlan_objmgr_trigger_vdev_comp_object_deletion(
+QDF_STATUS wlan_objmgr_trigger_vdev_comp_priv_object_deletion(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id);
 

umac/cmn_services/obj_mgr/src/wlan_objmgr_pdev_obj.c

@@ -48,7 +48,7 @@ static QDF_STATUS wlan_objmgr_pdev_object_status(
 		/* If component operates in Async, status is Partially created,
 			break */
 		} else if (pdev->obj_status[id] == QDF_STATUS_COMP_ASYNC) {
-			if (pdev->pdev_comp_obj[id] == NULL) {
+			if (pdev->pdev_comp_priv_obj[id] == NULL) {
 				status = QDF_STATUS_COMP_ASYNC;
 				break;
 			}
@@ -203,7 +203,7 @@ EXPORT_SYMBOL(wlan_objmgr_pdev_obj_delete);
 QDF_STATUS wlan_objmgr_pdev_component_obj_attach(
 		struct wlan_objmgr_pdev *pdev,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr,
+		void *comp_priv_obj,
 		QDF_STATUS status)
 {
 	uint8_t i;
@@ -219,14 +219,14 @@ QDF_STATUS wlan_objmgr_pdev_component_obj_attach(
 	}
 	wlan_pdev_obj_lock(pdev);
 	/* If there is a valid entry, return failure */
-	if (pdev->pdev_comp_obj[id] != NULL) {
+	if (pdev->pdev_comp_priv_obj[id] != NULL) {
 		qdf_print("%s: component-%d already have valid pointer\n",
 			  __func__, id);
 		wlan_pdev_obj_unlock(pdev);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Save component's pointer and status */
-	pdev->pdev_comp_obj[id] = comp_objptr;
+	pdev->pdev_comp_priv_obj[id] = comp_priv_obj;
 	pdev->obj_status[id] = status;
 	wlan_pdev_obj_unlock(pdev);
 
@@ -261,7 +261,7 @@ QDF_STATUS wlan_objmgr_pdev_component_obj_attach(
 QDF_STATUS wlan_objmgr_pdev_component_obj_detach(
 		struct wlan_objmgr_pdev *pdev,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr)
+		void *comp_priv_obj)
 {
 	QDF_STATUS obj_status;
 
@@ -271,13 +271,13 @@ QDF_STATUS wlan_objmgr_pdev_component_obj_detach(
 
 	wlan_pdev_obj_lock(pdev);
 	/* If there is a invalid entry, return failure */
-	if (pdev->pdev_comp_obj[id] != comp_objptr) {
+	if (pdev->pdev_comp_priv_obj[id] != comp_priv_obj) {
 		pdev->obj_status[id] = QDF_STATUS_E_FAILURE;
 		wlan_pdev_obj_unlock(pdev);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Reset pointers to NULL, update the status*/
-	pdev->pdev_comp_obj[id] = NULL;
+	pdev->pdev_comp_priv_obj[id] = NULL;
 	pdev->obj_status[id] = QDF_STATUS_SUCCESS;
 	wlan_pdev_obj_unlock(pdev);
 
@@ -426,7 +426,7 @@ QDF_STATUS wlan_objmgr_pdev_iterate_obj_list(
 }
 EXPORT_SYMBOL(wlan_objmgr_pdev_iterate_obj_list);
 
-QDF_STATUS wlan_objmgr_trigger_pdev_comp_object_creation(
+QDF_STATUS wlan_objmgr_trigger_pdev_comp_priv_object_creation(
 		struct wlan_objmgr_pdev *pdev,
 		enum wlan_umac_comp_id id)
 {
@@ -441,7 +441,7 @@ QDF_STATUS wlan_objmgr_trigger_pdev_comp_object_creation(
 	wlan_pdev_obj_lock(pdev);
 	/* If component object is already created, delete old
 		component object, then invoke creation */
-	if (pdev->pdev_comp_obj[id] != NULL) {
+	if (pdev->pdev_comp_priv_obj[id] != NULL) {
 		wlan_pdev_obj_unlock(pdev);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -467,7 +467,7 @@ QDF_STATUS wlan_objmgr_trigger_pdev_comp_object_creation(
 	return obj_status;
 }
 
-QDF_STATUS wlan_objmgr_trigger_pdev_comp_object_deletion(
+QDF_STATUS wlan_objmgr_trigger_pdev_comp_priv_object_deletion(
 		struct wlan_objmgr_pdev *pdev,
 		enum wlan_umac_comp_id id)
 {
@@ -481,7 +481,7 @@ QDF_STATUS wlan_objmgr_trigger_pdev_comp_object_deletion(
 
 	wlan_pdev_obj_lock(pdev);
 	/* Component object was never created, invalid operation */
-	if (pdev->pdev_comp_obj[id] == NULL) {
+	if (pdev->pdev_comp_priv_obj[id] == NULL) {
 		wlan_pdev_obj_unlock(pdev);
 		return QDF_STATUS_E_FAILURE;
 	}

umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c

@@ -49,7 +49,7 @@ static QDF_STATUS wlan_objmgr_peer_object_status(
 		/* If component operates in Async, status is Partially created,
 			break */
 		else if (peer->obj_status[id] == QDF_STATUS_COMP_ASYNC) {
-			if (peer->peer_comp_obj[id] == NULL) {
+			if (peer->peer_comp_priv_obj[id] == NULL) {
 				status = QDF_STATUS_COMP_ASYNC;
 				break;
 			}
@@ -234,7 +234,7 @@ QDF_STATUS wlan_objmgr_peer_obj_delete(struct wlan_objmgr_peer *peer)
 QDF_STATUS wlan_objmgr_peer_component_obj_attach(
 		struct wlan_objmgr_peer *peer,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr,
+		void *comp_priv_obj,
 		QDF_STATUS status)
 {
 	wlan_objmgr_peer_status_handler s_hler;
@@ -249,12 +249,12 @@ QDF_STATUS wlan_objmgr_peer_component_obj_attach(
 	wlan_peer_obj_lock(peer);
 	/* If there is a valid entry, return failure,
 	valid object needs to be freed first */
-	if (peer->peer_comp_obj[id] != NULL) {
+	if (peer->peer_comp_priv_obj[id] != NULL) {
 		wlan_peer_obj_unlock(peer);
 		return QDF_STATUS_E_FAILURE;
 	}
-	/* Assign component object pointer(can be NULL also), status */
-	peer->peer_comp_obj[id] = comp_objptr;
+	/* Assign component object private pointer(can be NULL also), status */
+	peer->peer_comp_priv_obj[id] = comp_priv_obj;
 	peer->obj_status[id] = status;
 	wlan_peer_obj_unlock(peer);
 
@@ -290,7 +290,7 @@ QDF_STATUS wlan_objmgr_peer_component_obj_attach(
 QDF_STATUS wlan_objmgr_peer_component_obj_detach(
 		struct wlan_objmgr_peer *peer,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr)
+		void *comp_priv_obj)
 {
 	QDF_STATUS obj_status;
 	struct wlan_objmgr_psoc *psoc;
@@ -316,13 +316,13 @@ QDF_STATUS wlan_objmgr_peer_component_obj_detach(
 
 	wlan_peer_obj_lock(peer);
 	/* If there is a invalid entry, return failure */
-	if (peer->peer_comp_obj[id] != comp_objptr) {
+	if (peer->peer_comp_priv_obj[id] != comp_priv_obj) {
 		peer->obj_status[id] = QDF_STATUS_E_FAILURE;
 		wlan_peer_obj_unlock(peer);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Reset the pointer to NULL */
-	peer->peer_comp_obj[id] = NULL;
+	peer->peer_comp_priv_obj[id] = NULL;
 	peer->obj_status[id] = QDF_STATUS_SUCCESS;
 	wlan_peer_obj_unlock(peer);
 
@@ -379,7 +379,7 @@ QDF_STATUS wlan_objmgr_peer_component_obj_detach(
 }
 
 
-QDF_STATUS wlan_objmgr_trigger_peer_comp_object_creation(
+QDF_STATUS wlan_objmgr_trigger_peer_comp_priv_object_creation(
 		struct wlan_objmgr_peer *peer,
 		enum wlan_umac_comp_id id)
 {
@@ -394,7 +394,7 @@ QDF_STATUS wlan_objmgr_trigger_peer_comp_object_creation(
 	wlan_peer_obj_lock(peer);
 	/* If component object is already created, delete old
 		component object, then invoke creation */
-	if (peer->peer_comp_obj[id] != NULL) {
+	if (peer->peer_comp_priv_obj[id] != NULL) {
 		wlan_peer_obj_unlock(peer);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -423,7 +423,7 @@ QDF_STATUS wlan_objmgr_trigger_peer_comp_object_creation(
 }
 
 
-QDF_STATUS wlan_objmgr_trigger_peer_comp_object_deletion(
+QDF_STATUS wlan_objmgr_trigger_peer_comp_priv_object_deletion(
 		struct wlan_objmgr_peer *peer,
 		enum wlan_umac_comp_id id)
 {
@@ -437,7 +437,7 @@ QDF_STATUS wlan_objmgr_trigger_peer_comp_object_deletion(
 
 	wlan_peer_obj_lock(peer);
 	/* Component object was never created, invalid operation */
-	if (peer->peer_comp_obj[id] == NULL) {
+	if (peer->peer_comp_priv_obj[id] == NULL) {
 		wlan_peer_obj_unlock(peer);
 		return QDF_STATUS_E_FAILURE;
 	}

umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj.c

@@ -48,7 +48,7 @@ static QDF_STATUS wlan_objmgr_psoc_object_status(
 		/* If component operates in Async, status is Partially created,
 			break */
 		else if (psoc->obj_status[id] == QDF_STATUS_COMP_ASYNC) {
-			if (psoc->soc_comp_obj[id] == NULL) {
+			if (psoc->soc_comp_priv_obj[id] == NULL) {
 				status = QDF_STATUS_COMP_ASYNC;
 				break;
 			}
@@ -224,7 +224,7 @@ EXPORT_SYMBOL(wlan_objmgr_psoc_obj_delete);
 QDF_STATUS wlan_objmgr_psoc_component_obj_attach(
 		struct wlan_objmgr_psoc *psoc,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr,
+		void *comp_priv_obj,
 		QDF_STATUS status)
 {
 	wlan_objmgr_psoc_status_handler stat_handler;
@@ -238,12 +238,12 @@ QDF_STATUS wlan_objmgr_psoc_component_obj_attach(
 
 	wlan_psoc_obj_lock(psoc);
 	/* If there is a valid entry, return failure */
-	if (psoc->soc_comp_obj[id] != NULL) {
+	if (psoc->soc_comp_priv_obj[id] != NULL) {
 		wlan_psoc_obj_unlock(psoc);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Save component's pointer and status */
-	psoc->soc_comp_obj[id] = comp_objptr;
+	psoc->soc_comp_priv_obj[id] = comp_priv_obj;
 	psoc->obj_status[id] = status;
 	wlan_psoc_obj_unlock(psoc);
 
@@ -281,7 +281,7 @@ QDF_STATUS wlan_objmgr_psoc_component_obj_attach(
 QDF_STATUS wlan_objmgr_psoc_component_obj_detach(
 		struct wlan_objmgr_psoc *psoc,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr)
+		void *comp_priv_obj)
 {
 	QDF_STATUS obj_status;
 
@@ -291,13 +291,13 @@ QDF_STATUS wlan_objmgr_psoc_component_obj_detach(
 
 	wlan_psoc_obj_lock(psoc);
 	/* If there is a valid entry, return failure */
-	if (psoc->soc_comp_obj[id] != comp_objptr) {
+	if (psoc->soc_comp_priv_obj[id] != comp_priv_obj) {
 		psoc->obj_status[id] = QDF_STATUS_E_FAILURE;
 		wlan_psoc_obj_unlock(psoc);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Reset pointers to NULL, update the status*/
-	psoc->soc_comp_obj[id] = NULL;
+	psoc->soc_comp_priv_obj[id] = NULL;
 	psoc->obj_status[id] = QDF_STATUS_SUCCESS;
 	wlan_psoc_obj_unlock(psoc);
 
@@ -479,7 +479,7 @@ QDF_STATUS wlan_objmgr_free_all_objects_per_psoc(
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS wlan_objmgr_trigger_psoc_comp_object_creation(
+QDF_STATUS wlan_objmgr_trigger_psoc_comp_priv_object_creation(
 		struct wlan_objmgr_psoc *psoc,
 		enum wlan_umac_comp_id id)
 {
@@ -495,7 +495,7 @@ QDF_STATUS wlan_objmgr_trigger_psoc_comp_object_creation(
 	/* If component object is already created, delete old
 	 * component object, then invoke creation
 	 */
-	if (psoc->soc_comp_obj[id] != NULL) {
+	if (psoc->soc_comp_priv_obj[id] != NULL) {
 		wlan_psoc_obj_unlock(psoc);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -521,7 +521,7 @@ QDF_STATUS wlan_objmgr_trigger_psoc_comp_object_creation(
 	return obj_status;
 }
 
-QDF_STATUS wlan_objmgr_trigger_psoc_comp_object_deletion(
+QDF_STATUS wlan_objmgr_trigger_psoc_comp_priv_object_deletion(
 		struct wlan_objmgr_psoc *psoc,
 		enum wlan_umac_comp_id id)
 {
@@ -535,7 +535,7 @@ QDF_STATUS wlan_objmgr_trigger_psoc_comp_object_deletion(
 
 	wlan_psoc_obj_lock(psoc);
 	/* Component object was never created, invalid operation */
-	if (psoc->soc_comp_obj[id] == NULL) {
+	if (psoc->soc_comp_priv_obj[id] == NULL) {
 		wlan_psoc_obj_unlock(psoc);
 		return QDF_STATUS_E_FAILURE;
 	}

umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c

@@ -51,7 +51,7 @@ static QDF_STATUS wlan_objmgr_vdev_object_status(
 		 * break
 		 */
 		} else if (vdev->obj_status[id] == QDF_STATUS_COMP_ASYNC) {
-			if (vdev->vdev_comp_obj[id] == NULL) {
+			if (vdev->vdev_comp_priv_obj[id] == NULL) {
 				status = QDF_STATUS_COMP_ASYNC;
 				break;
 			}
@@ -250,7 +250,7 @@ QDF_STATUS wlan_objmgr_vdev_obj_delete(struct wlan_objmgr_vdev *vdev)
 QDF_STATUS wlan_objmgr_vdev_component_obj_attach(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr,
+		void *comp_priv_obj,
 		QDF_STATUS status)
 {
 	wlan_objmgr_vdev_status_handler stat_handler;
@@ -264,12 +264,12 @@ QDF_STATUS wlan_objmgr_vdev_component_obj_attach(
 
 	wlan_vdev_obj_lock(vdev);
 	/* If there is a valid entry, return failure */
-	if (vdev->vdev_comp_obj[id] != NULL) {
+	if (vdev->vdev_comp_priv_obj[id] != NULL) {
 		wlan_vdev_obj_unlock(vdev);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Save component's pointer and status */
-	vdev->vdev_comp_obj[id] = comp_objptr;
+	vdev->vdev_comp_priv_obj[id] = comp_priv_obj;
 	vdev->obj_status[id] = status;
 	wlan_vdev_obj_unlock(vdev);
 
@@ -308,7 +308,7 @@ EXPORT_SYMBOL(wlan_objmgr_vdev_component_obj_attach);
 QDF_STATUS wlan_objmgr_vdev_component_obj_detach(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id,
-		void *comp_objptr)
+		void *comp_priv_obj)
 {
 	QDF_STATUS obj_status;
 
@@ -317,13 +317,13 @@ QDF_STATUS wlan_objmgr_vdev_component_obj_detach(
 		return QDF_STATUS_MAXCOMP_FAIL;
 	wlan_vdev_obj_lock(vdev);
 	/* If there is a valid entry, return failure */
-	if (vdev->vdev_comp_obj[id] != comp_objptr) {
+	if (vdev->vdev_comp_priv_obj[id] != comp_priv_obj) {
 		vdev->obj_status[id] = QDF_STATUS_E_FAILURE;
 		wlan_vdev_obj_unlock(vdev);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Reset pointers to NULL, update the status*/
-	vdev->vdev_comp_obj[id] = NULL;
+	vdev->vdev_comp_priv_obj[id] = NULL;
 	vdev->obj_status[id] = QDF_STATUS_SUCCESS;
 	wlan_vdev_obj_unlock(vdev);
 
@@ -426,7 +426,7 @@ QDF_STATUS wlan_objmgr_iterate_peerobj_list(
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS wlan_objmgr_trigger_vdev_comp_object_creation(
+QDF_STATUS wlan_objmgr_trigger_vdev_comp_priv_object_creation(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id)
 {
@@ -443,7 +443,7 @@ QDF_STATUS wlan_objmgr_trigger_vdev_comp_object_creation(
 	 * If component object is already created, delete old
 	 * component object, then invoke creation
 	 */
-	if (vdev->vdev_comp_obj[id] != NULL) {
+	if (vdev->vdev_comp_priv_obj[id] != NULL) {
 		wlan_vdev_obj_unlock(vdev);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -470,7 +470,7 @@ QDF_STATUS wlan_objmgr_trigger_vdev_comp_object_creation(
 	return obj_status;
 }
 
-QDF_STATUS wlan_objmgr_trigger_vdev_comp_object_deletion(
+QDF_STATUS wlan_objmgr_trigger_vdev_comp_priv_object_deletion(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id)
 {
@@ -484,7 +484,7 @@ QDF_STATUS wlan_objmgr_trigger_vdev_comp_object_deletion(
 
 	wlan_vdev_obj_lock(vdev);
 	/* Component object was never created, invalid operation */
-	if (vdev->vdev_comp_obj[id] == NULL) {
+	if (vdev->vdev_comp_priv_obj[id] == NULL) {
 		wlan_vdev_obj_unlock(vdev);
 		return QDF_STATUS_E_FAILURE;
 	}