Просмотр исходного кода

qcacmn: Change return type to QDF_STATUS

Maintain harmony in return type as "QDF_STATUS"
for CFR related APIs.

CRs-Fixed: 2767660
Change-Id: Ie35c104d32452d01d3c05b5059ee1b1bfe535a58
Adwait Nayak 4 лет назад
Родитель
Сommit
b081974d4d

+ 6 - 4
target_if/cfr/inc/target_if_cfr.h

@@ -55,8 +55,9 @@
  *
  * Return: Registration status for necessary handlers
  */
-int target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
-			    struct wlan_objmgr_pdev *pdev);
+QDF_STATUS
+target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
+			struct wlan_objmgr_pdev *pdev);
 
 /**
  * target_if_cfr_deinit_pdev() - De-inits corresponding pdev and handlers.
@@ -65,8 +66,9 @@ int target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
  *
  * Return: De-registration status for necessary handlers
  */
-int target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc,
-			      struct wlan_objmgr_pdev *pdev);
+QDF_STATUS
+target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc,
+			  struct wlan_objmgr_pdev *pdev);
 
 /**
  * target_if_cfr_tx_ops_register() - Registers tx ops for cfr module

+ 14 - 10
target_if/cfr/src/target_if_cfr.c

@@ -288,8 +288,9 @@ static QDF_STATUS target_if_cfr_deinit_target(struct wlan_objmgr_psoc *psoc,
 	return cfr_enh_deinit_pdev(psoc, pdev);
 }
 
-int target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
-			    struct wlan_objmgr_pdev *pdev)
+QDF_STATUS
+target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
+			struct wlan_objmgr_pdev *pdev)
 {
 	uint32_t target_type;
 	QDF_STATUS status;
@@ -307,11 +308,12 @@ int target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
 		status = QDF_STATUS_SUCCESS;
 	}
 
-	return qdf_status_to_os_return(status);
+	return status;
 }
 
-int target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc,
-			      struct wlan_objmgr_pdev *pdev)
+QDF_STATUS
+target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc,
+			  struct wlan_objmgr_pdev *pdev)
 {
 	uint32_t target_type;
 	QDF_STATUS status;
@@ -328,11 +330,12 @@ int target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc,
 		status = QDF_STATUS_SUCCESS;
 	}
 
-	return qdf_status_to_os_return(status);
+	return status;
 }
 #else
-int target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
-			    struct wlan_objmgr_pdev *pdev)
+QDF_STATUS
+target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
+			struct wlan_objmgr_pdev *pdev)
 {
 	uint32_t target_type;
 	struct pdev_cfr *pa;
@@ -379,8 +382,9 @@ int target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc,
 		return QDF_STATUS_E_NOSUPPORT;
 }
 
-int target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc,
-			      struct wlan_objmgr_pdev *pdev)
+QDF_STATUS
+target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc,
+			  struct wlan_objmgr_pdev *pdev)
 {
 	uint32_t target_type;
 

+ 8 - 8
target_if/cfr/src/target_if_cfr_enh.c

@@ -1439,18 +1439,18 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen)
  *
  * Return: Success/Failure status
  */
-static int
+static QDF_STATUS
 target_if_register_tx_completion_enh_event_handler(struct wlan_objmgr_psoc
 						   *psoc)
 {
 	/* Register completion handler here */
 	wmi_unified_t wmi_hdl;
-	int ret = 0;
+	QDF_STATUS ret = QDF_STATUS_SUCCESS;
 
 	wmi_hdl = get_wmi_unified_hdl_from_psoc(psoc);
 	if (!wmi_hdl) {
 		cfr_err("Unable to get wmi handle");
-		return -EINVAL;
+		return QDF_STATUS_E_NULL_VALUE;
 	}
 
 	ret = wmi_unified_register_event_handler(wmi_hdl,
@@ -1474,18 +1474,18 @@ target_if_register_tx_completion_enh_event_handler(struct wlan_objmgr_psoc
  *
  * Return: Success/Failure status
  */
-static int
+static QDF_STATUS
 target_if_unregister_tx_completion_enh_event_handler(struct wlan_objmgr_psoc
 						     *psoc)
 {
 	/* Unregister completion handler here */
 	wmi_unified_t wmi_hdl;
-	int status = 0;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	wmi_hdl = get_wmi_unified_hdl_from_psoc(psoc);
 	if (!wmi_hdl) {
 		cfr_err("Unable to get wmi handle");
-		return -EINVAL;
+		return QDF_STATUS_E_NULL_VALUE;
 	}
 
 	status = wmi_unified_unregister_event(wmi_hdl,
@@ -1776,14 +1776,14 @@ QDF_STATUS cfr_enh_init_pdev(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS cfr_enh_deinit_pdev(struct wlan_objmgr_psoc *psoc,
 			       struct wlan_objmgr_pdev *pdev)
 {
-	int status;
+	QDF_STATUS status;
 	struct pdev_cfr *pcfr;
 
 	pcfr = wlan_objmgr_pdev_get_comp_private_obj(pdev,
 						     WLAN_UMAC_COMP_CFR);
 	if (!pcfr) {
 		cfr_err("pcfr is NULL");
-		return -EINVAL;
+		return QDF_STATUS_E_NULL_VALUE;
 	}
 
 	if (pcfr->lut_timer_init) {

+ 2 - 2
umac/cfr/dispatcher/inc/wlan_cfr_tgt_api.h

@@ -34,7 +34,7 @@
  *
  * Return: success/failure of init
  */
-int tgt_cfr_init_pdev(struct wlan_objmgr_pdev *pdev);
+QDF_STATUS tgt_cfr_init_pdev(struct wlan_objmgr_pdev *pdev);
 
 /**
  * tgt_cfr_deinit_pdev() - API that de-registers CFR to handlers.
@@ -42,7 +42,7 @@ int tgt_cfr_init_pdev(struct wlan_objmgr_pdev *pdev);
  *
  * Return: success/failure of de-init
  */
-int tgt_cfr_deinit_pdev(struct wlan_objmgr_pdev *pdev);
+QDF_STATUS tgt_cfr_deinit_pdev(struct wlan_objmgr_pdev *pdev);
 
 /**
  * tgt_cfr_get_target_type() - API to determine target type.

+ 6 - 6
umac/cfr/dispatcher/src/wlan_cfr_tgt_api.c

@@ -104,10 +104,10 @@ int tgt_cfr_get_target_type(struct wlan_objmgr_psoc *psoc)
 	return target_type;
 }
 
-int tgt_cfr_init_pdev(struct wlan_objmgr_pdev *pdev)
+QDF_STATUS tgt_cfr_init_pdev(struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_lmac_if_cfr_tx_ops *cfr_tx_ops = NULL;
-	int status = 0;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct wlan_objmgr_psoc *psoc = wlan_pdev_get_psoc(pdev);
 
 	cfr_tx_ops = wlan_psoc_get_cfr_txops(psoc);
@@ -115,16 +115,16 @@ int tgt_cfr_init_pdev(struct wlan_objmgr_pdev *pdev)
 	if (cfr_tx_ops->cfr_init_pdev)
 		status = cfr_tx_ops->cfr_init_pdev(psoc, pdev);
 
-	if (status != 0)
+	if (QDF_IS_STATUS_ERROR(status))
 		cfr_err("Error occurred with exit code %d\n", status);
 
 	return status;
 }
 
-int tgt_cfr_deinit_pdev(struct wlan_objmgr_pdev *pdev)
+QDF_STATUS tgt_cfr_deinit_pdev(struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_lmac_if_cfr_tx_ops *cfr_tx_ops = NULL;
-	int status = 0;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct wlan_objmgr_psoc *psoc = wlan_pdev_get_psoc(pdev);
 
 	cfr_tx_ops = wlan_psoc_get_cfr_txops(psoc);
@@ -132,7 +132,7 @@ int tgt_cfr_deinit_pdev(struct wlan_objmgr_pdev *pdev)
 	if (cfr_tx_ops->cfr_deinit_pdev)
 		status = cfr_tx_ops->cfr_deinit_pdev(psoc, pdev);
 
-	if (status != 0)
+	if (QDF_IS_STATUS_ERROR(status))
 		cfr_err("Error occurred with exit code %d\n", status);
 
 	return status;

+ 4 - 4
umac/cfr/dispatcher/src/wlan_cfr_utils_api.c

@@ -96,7 +96,7 @@ QDF_STATUS wlan_cfr_deinit(void)
 
 QDF_STATUS wlan_cfr_pdev_open(struct wlan_objmgr_pdev *pdev)
 {
-	int status;
+	QDF_STATUS status;
 
 	if (wlan_cfr_is_feature_disabled(pdev)) {
 		cfr_err("cfr is disabled");
@@ -123,7 +123,7 @@ QDF_STATUS wlan_cfr_pdev_open(struct wlan_objmgr_pdev *pdev)
 
 QDF_STATUS wlan_cfr_pdev_close(struct wlan_objmgr_pdev *pdev)
 {
-	int status = QDF_STATUS_SUCCESS;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (wlan_cfr_is_feature_disabled(pdev)) {
 		cfr_err("cfr is disabled");
@@ -141,7 +141,7 @@ QDF_STATUS wlan_cfr_pdev_close(struct wlan_objmgr_pdev *pdev)
 
 QDF_STATUS cfr_initialize_pdev(struct wlan_objmgr_pdev *pdev)
 {
-	int status = QDF_STATUS_SUCCESS;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (wlan_cfr_is_feature_disabled(pdev)) {
 		cfr_err("cfr is disabled");
@@ -161,7 +161,7 @@ qdf_export_symbol(cfr_initialize_pdev);
 
 QDF_STATUS cfr_deinitialize_pdev(struct wlan_objmgr_pdev *pdev)
 {
-	int status = QDF_STATUS_SUCCESS;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (wlan_cfr_is_feature_disabled(pdev)) {
 		cfr_err("cfr is disabled");

+ 4 - 4
umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h

@@ -523,10 +523,10 @@ struct wlan_lmac_if_sa_api_tx_ops {
  * a successful commit session.
  */
 struct wlan_lmac_if_cfr_tx_ops {
-	int (*cfr_init_pdev)(struct wlan_objmgr_psoc *psoc,
-			     struct wlan_objmgr_pdev *pdev);
-	int (*cfr_deinit_pdev)(struct wlan_objmgr_psoc *psoc,
-			       struct wlan_objmgr_pdev *pdev);
+	QDF_STATUS (*cfr_init_pdev)(struct wlan_objmgr_psoc *psoc,
+				    struct wlan_objmgr_pdev *pdev);
+	QDF_STATUS (*cfr_deinit_pdev)(struct wlan_objmgr_psoc *psoc,
+				      struct wlan_objmgr_pdev *pdev);
 	int (*cfr_enable_cfr_timer)(struct wlan_objmgr_pdev *pdev,
 				    uint32_t cfr_timer);
 	int (*cfr_start_capture)(struct wlan_objmgr_pdev *pdev,