qcacmn: Remove dp handles from umac objects

Remove pdev, vdev and peer dp handles from umac objects,
and also remove corresponding APIs used to set and get
these handles

Change-Id: I1abc8ba91e9a697b85d1711a9a37ce675e1f6d3d
CRs-Fixed: 2602133

umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -193,7 +193,6 @@ struct wlan_objmgr_pdev_objmgr {
  * @obj_status[]:      object status of each component object
  * @obj_state:         object state
  * @tgt_if_handle:     Target interface handle
- * @dp_handle:         DP module handle
  * @pdev_lock:         lock to protect object
 */
 struct wlan_objmgr_pdev {
@@ -205,7 +204,6 @@ struct wlan_objmgr_pdev {
 	QDF_STATUS obj_status[WLAN_UMAC_MAX_COMPONENTS];
 	WLAN_OBJ_STATE obj_state;
 	target_pdev_info_t *tgt_if_handle;
-	void *dp_handle;
 	qdf_spinlock_t pdev_lock;
 };
 
@@ -1040,40 +1038,6 @@ static inline uint8_t wlan_pdev_get_vdev_count(struct wlan_objmgr_pdev *pdev)
 	return pdev->pdev_objmgr.wlan_vdev_count;
 }
 
-/**
- * wlan_pdev_set_dp_handle() - set dp handle
- * @pdev: pdev object pointer
- * @dp_handle: Data path module handle
- *
- * Return: void
- */
-static inline void wlan_pdev_set_dp_handle(struct wlan_objmgr_pdev *pdev,
-		void *dp_handle)
-{
-	if (qdf_unlikely(!pdev)) {
-		QDF_BUG(0);
-		return;
-	}
-
-	pdev->dp_handle = dp_handle;
-}
-
-/**
- * wlan_pdev_get_dp_handle() - get dp handle
- * @pdev: pdev object pointer
- *
- * Return: dp handle
- */
-static inline void *wlan_pdev_get_dp_handle(struct wlan_objmgr_pdev *pdev)
-{
-	if (qdf_unlikely(!pdev)) {
-		QDF_BUG(0);
-		return NULL;
-	}
-
-	return pdev->dp_handle;
-}
-
 /**
  * wlan_print_pdev_info() - print pdev members
  * @pdev: pdev object pointer

umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -167,7 +167,6 @@ struct wlan_objmgr_peer_objmgr {
  * @peer_comp_priv_obj[]:  Component's private object pointers
  * @obj_status[]:     status of each component object
  * @obj_state:        Status of Peer object
- * @dp_handle:        DP module handle
  * @pdev_id:          Pdev ID
  * @peer_lock:        Lock for access/update peer contents
  */
@@ -181,7 +180,6 @@ struct wlan_objmgr_peer {
 	void *peer_comp_priv_obj[WLAN_UMAC_MAX_COMPONENTS];
 	QDF_STATUS obj_status[WLAN_UMAC_MAX_COMPONENTS];
 	WLAN_OBJ_STATE obj_state;
-	void *dp_handle;
 	qdf_spinlock_t peer_lock;
 };
 
@@ -905,7 +903,7 @@ static inline void wlan_peer_set_vdev(struct wlan_objmgr_peer *peer,
  * Return: void
  */
 static inline void wlan_peer_mlme_flag_set(struct wlan_objmgr_peer *peer,
-				uint32_t flag)
+					   uint32_t flag)
 {
 	peer->peer_mlme.peer_flags |= flag;
 }
@@ -1056,40 +1054,6 @@ static inline void wlan_peer_mlme_reset_seq_num(
 	peer->peer_mlme.seq_num = 0;
 }
 
-/**
- * wlan_peer_set_dp_handle() - set dp handle
- * @peer: peer object pointer
- * @dp_handle: Data path module handle
- *
- * Return: void
- */
-static inline void wlan_peer_set_dp_handle(struct wlan_objmgr_peer *peer,
-		void *dp_handle)
-{
-	if (qdf_unlikely(!peer)) {
-		QDF_BUG(0);
-		return;
-	}
-
-	peer->dp_handle = dp_handle;
-}
-
-/**
- * wlan_peer_get_dp_handle() - get dp handle
- * @peer: peer object pointer
- *
- * Return: dp handle
- */
-static inline void *wlan_peer_get_dp_handle(struct wlan_objmgr_peer *peer)
-{
-	if (qdf_unlikely(!peer)) {
-		QDF_BUG(0);
-		return NULL;
-	}
-
-	return peer->dp_handle;
-}
-
 /**
  * wlan_peer_get_psoc() - get psoc
  * @peer: PEER object

umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h

@@ -365,7 +365,6 @@ struct wlan_objmgr_vdev_objmgr {
  * @vdev_comp_priv_obj[]:Component's private objects list
  * @obj_status[]:   Component object status
  * @obj_state:      VDEV object state
- * @dp_handle:      DP module handle
  * @vdev_lock:      VDEV lock
  */
 struct wlan_objmgr_vdev {
@@ -376,7 +375,6 @@ struct wlan_objmgr_vdev {
 	void *vdev_comp_priv_obj[WLAN_UMAC_MAX_COMPONENTS];
 	QDF_STATUS obj_status[WLAN_UMAC_MAX_COMPONENTS];
 	WLAN_OBJ_STATE obj_state;
-	void *dp_handle;
 	qdf_spinlock_t vdev_lock;
 };
 
@@ -1404,40 +1402,6 @@ static inline uint16_t wlan_vdev_get_max_peer_count(
 	return vdev->vdev_objmgr.max_peer_count;
 }
 
-/**
- * wlan_vdev_set_dp_handle() - set dp handle
- * @vdev: vdev object pointer
- * @dp_handle: Data path module handle
- *
- * Return: void
- */
-static inline void wlan_vdev_set_dp_handle(struct wlan_objmgr_vdev *vdev,
-		void *dp_handle)
-{
-	if (qdf_unlikely(!vdev)) {
-		QDF_BUG(0);
-		return;
-	}
-
-	vdev->dp_handle = dp_handle;
-}
-
-/**
- * wlan_vdev_get_dp_handle() - get dp handle
- * @vdev: vdev object pointer
- *
- * Return: dp handle
- */
-static inline void *wlan_vdev_get_dp_handle(struct wlan_objmgr_vdev *vdev)
-{
-	if (qdf_unlikely(!vdev)) {
-		QDF_BUG(0);
-		return NULL;
-	}
-
-	return vdev->dp_handle;
-}
-
 /**
  * wlan_print_vdev_info() - print vdev members
  * @vdev: vdev object pointer

umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_tgt_if_tx_api.c

@@ -57,7 +57,6 @@ QDF_STATUS tgt_vdev_mgr_create_send(
 	struct wlan_objmgr_pdev *pdev;
 	struct wlan_objmgr_vdev *vdev;
 	ol_txrx_soc_handle soc_txrx_handle;
-	struct cdp_vdev *vdev_txrx_handle;
 	enum wlan_op_mode cdp_txrx_opmode;
 	enum wlan_op_subtype cdp_txrx_subtype;
 	uint32_t vdev_id;
@@ -97,19 +96,11 @@ QDF_STATUS tgt_vdev_mgr_create_send(
 	if (!soc_txrx_handle)
 		return QDF_STATUS_E_FAILURE;
 
-	vdev_txrx_handle = cdp_vdev_attach(soc_txrx_handle,
-					   wlan_objmgr_pdev_get_pdev_id(pdev),
-					   vdev_addr, vdev_id,
-					   cdp_txrx_opmode,
-					   cdp_txrx_subtype);
-	if (!vdev_txrx_handle) {
-		wlan_vdev_set_dp_handle(vdev, NULL);
-		return QDF_STATUS_E_FAILURE;
-	} else {
-		wlan_vdev_set_dp_handle(vdev, vdev_txrx_handle);
-	}
-
-	return status;
+	return cdp_vdev_attach(soc_txrx_handle,
+			       wlan_objmgr_pdev_get_pdev_id(pdev),
+			       vdev_addr, vdev_id,
+			       cdp_txrx_opmode,
+			       cdp_txrx_subtype);
 }
 
 QDF_STATUS tgt_vdev_mgr_create_complete(struct vdev_mlme_obj *vdev_mlme)
@@ -215,11 +206,9 @@ QDF_STATUS tgt_vdev_mgr_delete_send(
 
 	psoc = wlan_vdev_get_psoc(vdev);
 	soc_txrx_handle = wlan_psoc_get_dp_handle(psoc);
-	if (soc_txrx_handle) {
-		wlan_vdev_set_dp_handle(vdev, NULL);
+	if (soc_txrx_handle)
 		cdp_vdev_detach(soc_txrx_handle, wlan_vdev_get_id(vdev),
 				NULL, NULL);
-	}
 
 	status = txops->vdev_delete_send(vdev, param);
 	if (QDF_IS_STATUS_ERROR(status))