diff --git a/drivers/staging/qcacld-3.0/core/dp/htt/htt_h2t.c b/drivers/staging/qcacld-3.0/core/dp/htt/htt_h2t.c
index e1bed656e5ec..3038b831a3e5 100644
--- a/drivers/staging/qcacld-3.0/core/dp/htt/htt_h2t.c
+++ b/drivers/staging/qcacld-3.0/core/dp/htt/htt_h2t.c
@@ -629,7 +629,7 @@ htt_h2t_rx_ring_cfg_msg_hl(struct htt_pdev_t *pdev)
 
 	pkt = htt_htc_pkt_alloc(pdev);
 	if (!pkt)
-		return A_ERROR; /* failure */
+		return QDF_STATUS_E_FAILURE; /* failure */
 
 	/*
 	 * show that this is not a tx frame download
@@ -645,7 +645,7 @@ htt_h2t_rx_ring_cfg_msg_hl(struct htt_pdev_t *pdev)
 		HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, true);
 	if (!msg) {
 		htt_htc_pkt_free(pdev, pkt);
-		return A_ERROR; /* failure */
+		return QDF_STATUS_E_FAILURE; /* failure */
 	}
 	/*
 	 * Set the length of the message.
diff --git a/techpack/audio/asoc/codecs/wcd_cpe_services.c b/techpack/audio/asoc/codecs/wcd_cpe_services.c
index 96e2bb1945a4..fb6e1de56a21 100644
--- a/techpack/audio/asoc/codecs/wcd_cpe_services.c
+++ b/techpack/audio/asoc/codecs/wcd_cpe_services.c
@@ -987,7 +987,7 @@ static enum cpe_svc_result broadcast_boot_event(
 static enum cpe_process_result cpe_boot_initialize(struct cpe_info *t_info,
 	enum cpe_svc_result *cpe_rc)
 {
-	enum cpe_process_result rc = CPE_SVC_FAILED;
+	enum cpe_process_result rc = CPE_PROC_FAILED;
 	struct cpe_svc_notification payload;
 	struct cmi_core_svc_event_system_boot *p = NULL;
 
@@ -1991,7 +1991,7 @@ enum cmi_api_result cmi_send_msg(void *message)
 		      GFP_ATOMIC);
 	if (!msg) {
 		CPE_SVC_REL_LOCK(&cpe_d.cpe_api_mutex, "cpe_api");
-		return CPE_SVC_NO_MEMORY;
+		return CMI_API_NO_MEMORY;
 	}
 
 	if (CMI_HDR_GET_OBM_FLAG(hdr) == CMI_OBM_FLAG_OUT_BAND)
@@ -2006,7 +2006,7 @@ enum cmi_api_result cmi_send_msg(void *message)
 	if (!msg->payload) {
 		kfree(msg);
 		CPE_SVC_REL_LOCK(&cpe_d.cpe_api_mutex, "cpe_api");
-		return CPE_SVC_NO_MEMORY;
+		return CMI_API_NO_MEMORY;
 	}
 
 	msg->address = 0;