diff --git a/target_if/son/src/target_if_son.c b/target_if/son/src/target_if_son.c
index 5d2d9afdacc6..d41ab7104187 100644
--- a/target_if/son/src/target_if_son.c
+++ b/target_if/son/src/target_if_son.c
@@ -40,7 +40,7 @@ int8_t son_ol_sanitize_util_invtl(struct wlan_objmgr_pdev *pdev,
 				  u_int32_t *sample_period,
 				  u_int32_t *num_of_sample)
 {
-	return EOK;
+	return 0;
 }
 
 QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev,
@@ -67,12 +67,12 @@ QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev,
 
 int son_ol_lmac_create(struct wlan_objmgr_pdev *pdev)
 {
-	return EOK;
+	return 0;
 }
 
 int son_ol_lmac_destroy(struct wlan_objmgr_pdev *pdev)
 {
-	return EOK;
+	return 0;
 
 }
 
@@ -131,24 +131,24 @@ QDF_STATUS son_ol_send_null(struct wlan_objmgr_pdev *pdev,
 			    u_int8_t *macaddr,
 			    struct wlan_objmgr_vdev *vdev)
 {
-	return EOK;
+	return QDF_STATUS_SUCCESS;
 }
 int8_t son_ol_sanitize_util_invtl(struct wlan_objmgr_pdev *pdev,
 				  u_int32_t *sample_period,
 				  u_int32_t *num_of_sample)
 {
-	return EOK;
+	return 0;
 }
 
 int son_ol_lmac_create(struct wlan_objmgr_pdev *pdev)
 {
-	return EOK;
+	return 0;
 }
 
 
 int son_ol_lmac_destroy(struct wlan_objmgr_pdev *pdev)
 {
-	return EOK;
+	return 0;
 
 }
 
diff --git a/utils/epping/src/epping_txrx.c b/utils/epping/src/epping_txrx.c
index b72350f60f52..a4316be20148 100644
--- a/utils/epping/src/epping_txrx.c
+++ b/utils/epping/src/epping_txrx.c
@@ -429,7 +429,7 @@ int epping_connect_service(epping_context_t *pEpping_ctx)
 	/* connect to service */
 	connect.service_id = WMI_DATA_BE_SVC;
 	status = htc_connect_service(pEpping_ctx->HTCHandle, &connect, &response);
-	if (status != EOK) {
+	if (QDF_IS_STATUS_ERROR(status)) {
 		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "Failed to connect to Endpoint Ping BE service status:%d\n",
 			   status);
@@ -443,7 +443,7 @@ int epping_connect_service(epping_context_t *pEpping_ctx)
 #if defined(HIF_PCI) || defined(HIF_USB) || defined(HIF_SNOC)
 	connect.service_id = WMI_DATA_BK_SVC;
 	status = htc_connect_service(pEpping_ctx->HTCHandle, &connect, &response);
-	if (status != EOK) {
+	if (QDF_IS_STATUS_ERROR(status)) {
 		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "Failed to connect to Endpoint Ping BK service status:%d\n",
 			   status);
diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c
index c9eb9406f880..a11c4cb722ba 100644
--- a/wmi/src/wmi_unified.c
+++ b/wmi/src/wmi_unified.c
@@ -2767,12 +2767,12 @@ static void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt)
  * @wmi_handle: handle to WMI.
  * @pdev_idx: Pdev index
  *
- * @Return: status.
+ * @Return: QDF_STATUS
  */
-static int wmi_connect_pdev_htc_service(struct wmi_soc *soc,
-						uint32_t pdev_idx)
+static QDF_STATUS wmi_connect_pdev_htc_service(struct wmi_soc *soc,
+					       uint32_t pdev_idx)
 {
-	int status;
+	QDF_STATUS status;
 	struct htc_service_connect_resp response;
 	struct htc_service_connect_req connect;
 
@@ -2794,14 +2794,11 @@ static int wmi_connect_pdev_htc_service(struct wmi_soc *soc,
 
 	/* connect to control service */
 	connect.service_id = soc->svc_ids[pdev_idx];
-	status = htc_connect_service(soc->htc_handle, &connect,
-				&response);
+	status = htc_connect_service(soc->htc_handle, &connect, &response);
 
-
-	if (status != EOK) {
-		WMI_LOGE
-			("Failed to connect to WMI CONTROL service status:%d\n",
-			status);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		WMI_LOGE("Failed to connect to WMI CONTROL service status:%d\n",
+			 status);
 		return status;
 	}
 
@@ -2811,7 +2808,7 @@ static int wmi_connect_pdev_htc_service(struct wmi_soc *soc,
 	soc->wmi_endpoint_id[pdev_idx] = response.Endpoint;
 	soc->max_msg_len[pdev_idx] = response.MaxMsgLength;
 
-	return 0;
+	return QDF_STATUS_SUCCESS;
 }
 
 /**