qcacmn: Fix CLANG warnings in Data path

implicit conversion from enumeration type 'A_STATUS' to different enumeration type 'QDF_STATUS'
implicit conversion from enumeration type 'QDF_STATUS' to different enumeration type 'A_STATUS'

CRs-Fixed: 2063344
Change-Id: Id3613d0b7fca58c3d94c5af59838b0bff3ef26de

9 files changed, 75 insertions, 77 deletions

diff --git a/hif/src/ce/ce_diag.c b/hif/src/ce/ce_diag.c
index 42eb76c0829a..39ba091948d6 100644
--- a/hif/src/ce/ce_diag.c
+++ b/hif/src/ce/ce_diag.c
@@ -386,7 +386,7 @@ QDF_STATUS hif_diag_write_mem(struct hif_opaque_softc *hif_ctx,
 	data_buf = qdf_mem_alloc_consistent(scn->qdf_dev, scn->qdf_dev->dev,
 				    orig_nbytes, &CE_data_base);
 	if (!data_buf) {
-		status = A_NO_MEMORY;
+		status = QDF_STATUS_E_NOMEM;
 		goto done;
 	}
 
diff --git a/htc/htc.c b/htc/htc.c
index d9b29157efbc..aef0e0c1fc6e 100644
--- a/htc/htc.c
+++ b/htc/htc.c
@@ -496,9 +496,9 @@ uint8_t htc_get_credit_allocation(HTC_TARGET *target, uint16_t service_id)
 	return allocation;
 }
 
-A_STATUS htc_wait_target(HTC_HANDLE HTCHandle)
+QDF_STATUS htc_wait_target(HTC_HANDLE HTCHandle)
 {
-	A_STATUS status = A_OK;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
 	HTC_READY_EX_MSG *pReadyMsg;
 	struct htc_service_connect_req connect;
@@ -515,7 +515,7 @@ A_STATUS htc_wait_target(HTC_HANDLE HTCHandle)
 	do {
 
 		status = hif_start(target->hif_dev);
-		if (A_FAILED(status)) {
+		if (QDF_IS_STATUS_ERROR(status)) {
 			AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
 					("hif_start failed\n"));
 			break;
@@ -523,14 +523,14 @@ A_STATUS htc_wait_target(HTC_HANDLE HTCHandle)
 
 		status = htc_wait_recv_ctrl_message(target);
 
-		if (A_FAILED(status))
+		if (QDF_IS_STATUS_ERROR(status))
 			break;
 
 		if (target->CtrlResponseLength < (sizeof(HTC_READY_EX_MSG))) {
 			AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
 					("Invalid HTC Ready Msg Len:%d!\n",
 					 target->CtrlResponseLength));
-			status = A_ECOMM;
+			status = QDF_STATUS_E_BADMSG;
 			break;
 		}
 
@@ -543,7 +543,7 @@ A_STATUS htc_wait_target(HTC_HANDLE HTCHandle)
 			AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
 					("Invalid HTC Ready Msg : 0x%X!\n",
 					 htc_rdy_msg_id));
-			status = A_ECOMM;
+			status = QDF_STATUS_E_BADMSG;
 			break;
 		}
 
@@ -567,7 +567,7 @@ A_STATUS htc_wait_target(HTC_HANDLE HTCHandle)
 
 		if ((0 == target->TotalTransmitCredits)
 		    || (0 == target->TargetCreditSize)) {
-			status = A_ECOMM;
+			status = QDF_STATUS_E_ABORTED;
 			break;
 		}
 
@@ -645,12 +645,12 @@ static void reset_endpoint_states(HTC_TARGET *target)
  * htc_start() - Main HTC function to trigger HTC start
  * @HTCHandle: pointer to HTC handle
  *
- * Return: A_OK for success or an appropriate A_STATUS error
+ * Return: QDF_STATUS_SUCCESS for success or an appropriate QDF_STATUS error
  */
-A_STATUS htc_start(HTC_HANDLE HTCHandle)
+QDF_STATUS htc_start(HTC_HANDLE HTCHandle)
 {
 	qdf_nbuf_t netbuf;
-	A_STATUS status = A_OK;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
 	HTC_SETUP_COMPLETE_EX_MSG *pSetupComp;
 	HTC_PACKET *pSendPacket;
@@ -667,7 +667,7 @@ A_STATUS htc_start(HTC_HANDLE HTCHandle)
 			AR_DEBUG_ASSERT(false);
 			qdf_print("%s: allocControlTxPacket failed\n",
 				  __func__);
-			status = A_NO_MEMORY;
+			status = QDF_STATUS_E_NOMEM;
 			break;
 		}
 
@@ -709,7 +709,7 @@ A_STATUS htc_start(HTC_HANDLE HTCHandle)
 				       ENDPOINT_0, HTC_SERVICE_TX_PACKET_TAG);
 
 		status = htc_send_pkt((HTC_HANDLE) target, pSendPacket);
-		if (A_FAILED(status))
+		if (QDF_IS_STATUS_ERROR(status))
 			break;
 	} while (false);
 
diff --git a/htc/htc_api.h b/htc/htc_api.h
index eaffb0329107..2131a6bf1789 100644
--- a/htc/htc_api.h
+++ b/htc/htc_api.h
@@ -435,7 +435,7 @@ void htc_set_credit_distribution(HTC_HANDLE HTCHandle,
  * ready.
  * Return: None
  */
-A_STATUS htc_wait_target(HTC_HANDLE HTCHandle);
+QDF_STATUS htc_wait_target(HTC_HANDLE HTCHandle);
 
 /**
  * htc_start - Start target service communications
@@ -449,7 +449,7 @@ A_STATUS htc_wait_target(HTC_HANDLE HTCHandle);
  * communicating over the endpoints.
  * Return: None
  */
-A_STATUS htc_start(HTC_HANDLE HTCHandle);
+QDF_STATUS htc_start(HTC_HANDLE HTCHandle);
 
 /**
  * htc_add_receive_pkt - Add receive packet to HTC
@@ -473,7 +473,7 @@ A_STATUS htc_add_receive_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
  * User provides callback handlersfor various endpoint events.
  * Return: None
  */
-A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
+QDF_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 			     struct htc_service_connect_req *pReq,
 			     struct htc_service_connect_resp *pResp);
 
@@ -496,9 +496,9 @@ void htc_dump(HTC_HANDLE HTCHandle, uint8_t CmdId, bool start);
  * Caller must initialize packet using SET_HTC_PACKET_INFO_TX() macro.
  * This interface is fully asynchronous.  On error, HTC SendPkt will
  * call the registered Endpoint callback to cleanup the packet.
- * Return: A_OK
+ * Return: QDF_STATUS_SUCCESS
  */
-A_STATUS htc_send_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
+QDF_STATUS htc_send_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
 
 /**
  * htc_send_data_pkt - Send an HTC packet containing a tx descriptor and data
@@ -514,10 +514,10 @@ A_STATUS htc_send_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
  * Return: A_OK
  */
 #ifdef ATH_11AC_TXCOMPACT
-A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, qdf_nbuf_t netbuf,
+QDF_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, qdf_nbuf_t netbuf,
 			   int Epid, int ActualLength);
 #else                           /*ATH_11AC_TXCOMPACT */
-A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket,
+QDF_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket,
 			   uint8_t more_data);
 #endif /*ATH_11AC_TXCOMPACT */
 
@@ -638,9 +638,9 @@ void htc_unblock_recv(HTC_HANDLE HTCHandle);
  * The caller may allocate the pkt queue on the stack to hold the pkts.
  * This interface is fully asynchronous.  On error, htc_send_pkts will
  * call the registered Endpoint callback to cleanup the packet.
- * Return: A_OK
+ * Return: QDF_STATUS_SUCCESS
  */
-A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
+QDF_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
 				HTC_PACKET_QUEUE *pPktQueue);
 
 /**
diff --git a/htc/htc_internal.h b/htc/htc_internal.h
index 43a469681f68..aeb0e836eb9c 100644
--- a/htc/htc_internal.h
+++ b/htc/htc_internal.h
@@ -312,7 +312,7 @@ void htc_flush_rx_hold_queue(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint);
 void htc_flush_endpoint_tx(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint,
 			   HTC_TX_TAG Tag);
 void htc_recv_init(HTC_TARGET *target);
-A_STATUS htc_wait_recv_ctrl_message(HTC_TARGET *target);
+QDF_STATUS htc_wait_recv_ctrl_message(HTC_TARGET *target);
 void htc_free_control_tx_packet(HTC_TARGET *target, HTC_PACKET *pPacket);
 HTC_PACKET *htc_alloc_control_tx_packet(HTC_TARGET *target);
 uint8_t htc_get_credit_allocation(HTC_TARGET *target, uint16_t service_id);
diff --git a/htc/htc_packet.h b/htc/htc_packet.h
index 5356e4f62d47..6eb8205df171 100644
--- a/htc/htc_packet.h
+++ b/htc/htc_packet.h
@@ -144,7 +144,7 @@ typedef struct _HTC_PACKET {
 	uint32_t BufferLength;
 	uint32_t ActualLength;
 	HTC_ENDPOINT_ID Endpoint;
-	A_STATUS Status;
+	QDF_STATUS Status;
 	union {
 		struct htc_tx_packet_info AsTx;
 		struct htc_rx_packet_info AsRx;
diff --git a/htc/htc_recv.c b/htc/htc_recv.c
index 2ebbc35de68e..db6000869952 100644
--- a/htc/htc_recv.c
+++ b/htc/htc_recv.c
@@ -585,7 +585,7 @@ A_STATUS htc_add_receive_pkt_multiple(HTC_HANDLE HTCHandle,
 	if (A_FAILED(status)) {
 		/* walk through queue and mark each one canceled */
 		HTC_PACKET_QUEUE_ITERATE_ALLOW_REMOVE(pPktQueue, pPacket) {
-			pPacket->Status = A_ECANCELED;
+			pPacket->Status = QDF_STATUS_E_CANCELED;
 		}
 		HTC_PACKET_QUEUE_ITERATE_END;
 
@@ -615,7 +615,7 @@ void htc_flush_rx_hold_queue(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint)
 		if (pPacket == NULL)
 			break;
 		UNLOCK_HTC_RX(target);
-		pPacket->Status = A_ECANCELED;
+		pPacket->Status = QDF_STATUS_E_CANCELED;
 		pPacket->ActualLength = 0;
 		AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
 				("Flushing RX packet:%p, length:%d, ep:%d\n",
@@ -637,7 +637,7 @@ void htc_recv_init(HTC_TARGET *target)
 }
 
 /* polling routine to wait for a control packet to be received */
-A_STATUS htc_wait_recv_ctrl_message(HTC_TARGET *target)
+QDF_STATUS htc_wait_recv_ctrl_message(HTC_TARGET *target)
 {
 /*    int count = HTC_TARGET_MAX_RESPONSE_POLL; */
 
@@ -646,7 +646,7 @@ A_STATUS htc_wait_recv_ctrl_message(HTC_TARGET *target)
 	/* Wait for BMI request/response transaction to complete */
 	if (qdf_wait_single_event(&target->ctrl_response_valid,
 				  HTC_CONTROL_RX_TIMEOUT)) {
-		return A_ERROR;
+		return QDF_STATUS_E_FAILURE;
 	}
 
 	LOCK_HTC_RX(target);
@@ -656,7 +656,7 @@ A_STATUS htc_wait_recv_ctrl_message(HTC_TARGET *target)
 	UNLOCK_HTC_RX(target);
 
 	AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCWaitCtrlMessageRecv success\n"));
-	return A_OK;
+	return QDF_STATUS_SUCCESS;
 }
 
 static A_STATUS htc_process_trailer(HTC_TARGET *target,
diff --git a/htc/htc_send.c b/htc/htc_send.c
index 8c9c90377712..7133ac12d7ca 100644
--- a/htc/htc_send.c
+++ b/htc/htc_send.c
@@ -403,13 +403,13 @@ htc_issue_tx_bundle_stats_inc(HTC_TARGET *target)
 
 #if defined(HIF_USB) || defined(HIF_SDIO)
 #ifdef ENABLE_BUNDLE_TX
-static A_STATUS htc_send_bundled_netbuf(HTC_TARGET *target,
+static QDF_STATUS htc_send_bundled_netbuf(HTC_TARGET *target,
 					HTC_ENDPOINT *pEndpoint,
 					unsigned char *pBundleBuffer,
 					HTC_PACKET *pPacketTx)
 {
 	qdf_size_t data_len;
-	A_STATUS status;
+	QDF_STATUS status;
 	qdf_nbuf_t bundleBuf;
 	uint32_t data_attr = 0;
 
@@ -438,7 +438,7 @@ static A_STATUS htc_send_bundled_netbuf(HTC_TARGET *target,
 			       pEndpoint->UL_PipeID,
 			       pEndpoint->Id, data_len,
 			       bundleBuf, data_attr);
-	if (status != A_OK) {
+	if (status != QDF_STATUS_SUCCESS) {
 		qdf_print("%s:hif_send_head failed(len=%zu).\n", __func__,
 			  data_len);
 	}
@@ -586,11 +586,11 @@ static void htc_issue_packets_bundle(HTC_TARGET *target,
  *
  * Return: QDF_STATUS_SUCCESS on success and error QDF status on failure
  */
-static A_STATUS htc_issue_packets(HTC_TARGET *target,
+static QDF_STATUS htc_issue_packets(HTC_TARGET *target,
 				  HTC_ENDPOINT *pEndpoint,
 				  HTC_PACKET_QUEUE *pPktQueue)
 {
-	A_STATUS status = A_OK;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	qdf_nbuf_t netbuf;
 	HTC_PACKET *pPacket = NULL;
 	uint16_t payloadLen;
@@ -673,7 +673,7 @@ static A_STATUS htc_issue_packets(HTC_TARGET *target,
 					AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
 						("%s nbuf Map Fail Endpnt %p\n",
 						__func__, pEndpoint));
-					status = A_ERROR;
+					status = QDF_STATUS_E_FAILURE;
 					break;
 				}
 			}
@@ -703,8 +703,8 @@ static A_STATUS htc_issue_packets(HTC_TARGET *target,
 
 		target->ce_send_cnt++;
 
-		if (qdf_unlikely(A_FAILED(status))) {
-			if (status != A_NO_RESOURCE) {
+		if (qdf_unlikely(QDF_IS_STATUS_ERROR(status))) {
+			if (status != QDF_STATUS_E_RESOURCES) {
 				/* TODO : if more than 1 endpoint maps to the
 				 * same PipeID it is possible to run out of
 				 * resources in the HIF layer. Don't emit the
@@ -736,7 +736,7 @@ static A_STATUS htc_issue_packets(HTC_TARGET *target,
 		if (pPacket->PktInfo.AsTx.Tag == HTC_TX_PACKET_TAG_RUNTIME_PUT)
 			hif_pm_runtime_put(target->hif_dev);
 	}
-	if (qdf_unlikely(A_FAILED(status))) {
+	if (qdf_unlikely(QDF_IS_STATUS_ERROR(status))) {
 		AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
 			("htc_issue_packets, failed pkt:0x%p status:%d",
 			 pPacket, status));
@@ -1291,10 +1291,10 @@ static enum HTC_SEND_QUEUE_RESULT htc_try_send(HTC_TARGET *target,
 		UNLOCK_HTC_TX(target);
 
 		/* send what we can */
-		result = htc_issue_packets(target, pEndpoint, &sendQueue);
-		if (result) {
+		if (htc_issue_packets(target, pEndpoint, &sendQueue)) {
 			int i;
 
+			result = HTC_SEND_QUEUE_DROP;
 			AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
 				("htc_issue_packets, failed status:%d put it back to head of callersSendQueue",
 				 result));
@@ -1418,7 +1418,7 @@ static A_STATUS htc_send_pkts_sched_queue(HTC_TARGET *target,
 
 #endif
 
-A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
+QDF_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
 				HTC_PACKET_QUEUE *pPktQueue)
 {
 	HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
@@ -1439,7 +1439,7 @@ A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
 	if (NULL == pPacket) {
 		OL_ATH_HTC_PKT_ERROR_COUNT_INCR(target, GET_HTC_PKT_Q_FAIL);
 		AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_send_pkts_multiple\n"));
-		return A_EINVAL;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX);
@@ -1448,7 +1448,7 @@ A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
 	if (!pEndpoint->service_id) {
 		AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("%s service_id is invalid\n",
 								__func__));
-		return A_EINVAL;
+		return QDF_STATUS_E_INVAL;
 	}
 
 #ifdef HTC_EP_STAT_PROFILING
@@ -1493,7 +1493,7 @@ A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
 			AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
 			   ("%s: nbuf map failed, endpoint %p, seq_no. %d\n",
 			   __func__, pEndpoint, pEndpoint->SeqNo));
-			return A_ERROR;
+			return status;
 		}
 
 		pPacket->PktInfo.AsTx.Flags |= HTC_TX_PACKET_FLAG_FIXUP_NETBUF;
@@ -1517,9 +1517,9 @@ A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
 			restore_tx_packet(target, pPacket);
 
 			if (HTC_STOPPING(target))
-				pPacket->Status = A_ECANCELED;
+				pPacket->Status = QDF_STATUS_E_CANCELED;
 			else
-				pPacket->Status = A_NO_RESOURCE;
+				pPacket->Status = QDF_STATUS_E_RESOURCES;
 		}
 		HTC_PACKET_QUEUE_ITERATE_END;
 
@@ -1528,16 +1528,16 @@ A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle,
 
 	AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_send_pkts_multiple\n"));
 
-	return A_OK;
+	return QDF_STATUS_SUCCESS;
 }
 
 /* HTC API - htc_send_pkt */
-A_STATUS htc_send_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
+QDF_STATUS htc_send_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
 {
 	HTC_PACKET_QUEUE queue;
 
 	if (HTCHandle == NULL || pPacket == NULL)
-		return A_ERROR;
+		return QDF_STATUS_E_FAILURE;
 
 	AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
 			("+-htc_send_pkt: Enter endPointId: %d, buffer: %p, length: %d\n",
@@ -1554,15 +1554,15 @@ A_STATUS htc_send_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
  * @netbuf: network buffer containing the data to be sent
  * @ActualLength: length of data that needs to be transmitted
  *
- * Return: A_OK for success or an appropriate A_STATUS error
+ * Return: QDF_STATUS_SUCCESS for success or an appropriate QDF_STATUS error
  */
-A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, qdf_nbuf_t netbuf, int Epid,
+QDF_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, qdf_nbuf_t netbuf, int Epid,
 			   int ActualLength)
 {
 	HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
 	HTC_ENDPOINT *pEndpoint;
 	HTC_FRAME_HDR *pHtcHdr;
-	A_STATUS status = A_OK;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	int tx_resources;
 	uint32_t data_attr = 0;
 
@@ -1580,11 +1580,11 @@ A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, qdf_nbuf_t netbuf, int Epid,
 							  pEndpoint->UL_PipeID);
 		}
 		if (tx_resources < HTC_DATA_MINDESC_PERPACKET)
-			return A_ERROR;
+			return QDF_STATUS_E_FAILURE;
 	}
 
 	if (hif_pm_runtime_get(target->hif_dev))
-		return A_ERROR;
+		return QDF_STATUS_E_FAILURE;
 
 	pHtcHdr = (HTC_FRAME_HDR *) qdf_nbuf_get_frag_vaddr(netbuf, 0);
 	AR_DEBUG_ASSERT(pHtcHdr);
@@ -1634,9 +1634,9 @@ A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, qdf_nbuf_t netbuf, int Epid,
  * @pPacket: pointer to HTC_PACKET
  * @more_data: indicates whether more data is to follow
  *
- * Return: A_OK for success or an appropriate A_STATUS error
+ * Return: QDF_STATUS_SUCCESS for success or an appropriate QDF_STATUS error
  */
-A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket,
+QDF_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket,
 			   uint8_t more_data)
 {
 	HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
@@ -1645,7 +1645,7 @@ A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket,
 	HTC_PACKET_QUEUE sendQueue;
 	qdf_nbuf_t netbuf = NULL;
 	int tx_resources;
-	A_STATUS status = A_OK;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	uint32_t data_attr = 0;
 
 	if (pPacket) {
@@ -1698,7 +1698,7 @@ A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket,
 		HTC_PACKET_ENQUEUE(&pEndpoint->TxQueue, pPacket);
 		if (HTC_TX_BUNDLE_ENABLED(target) && (more_data)) {
 			UNLOCK_HTC_TX(target);
-			return A_OK;
+			return QDF_STATUS_SUCCESS;
 		}
 
 		QDF_NBUF_UPDATE_TX_PKT_COUNT(netbuf, QDF_NBUF_TX_PKT_HTC);
@@ -1720,7 +1720,7 @@ A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket,
 		 */
 		qdf_atomic_dec(&pEndpoint->TxProcessCount);
 		UNLOCK_HTC_TX(target);
-		return A_OK;
+		return QDF_STATUS_SUCCESS;
 	}
 
 	/***** beyond this point only 1 thread may enter ******/
@@ -1813,7 +1813,7 @@ A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket,
 
 		htc_issue_tx_bundle_stats_inc(target);
 
-		if (qdf_unlikely(A_FAILED(status))) {
+		if (qdf_unlikely(QDF_IS_STATUS_ERROR(status))) {
 			LOCK_HTC_TX(target);
 			pEndpoint->ul_outstanding_cnt--;
 			/* remove this packet from the tx completion queue */
@@ -1980,7 +1980,7 @@ QDF_STATUS htc_tx_completion_handler(void *Context,
 				(HTC_PACKET_QUEUE *) pPacket->pContext;
 			HTC_PACKET_QUEUE_ITERATE_ALLOW_REMOVE(pQueueSave,
 							      pPacketTemp) {
-				pPacket->Status = A_OK;
+				pPacket->Status = QDF_STATUS_SUCCESS;
 				send_packet_completion(target, pPacketTemp);
 			}
 			HTC_PACKET_QUEUE_ITERATE_END;
@@ -2103,7 +2103,7 @@ void htc_flush_endpoint_tx(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint,
 
 		if (pPacket) {
 			/* let the sender know the packet was not delivered */
-			pPacket->Status = A_ECANCELED;
+			pPacket->Status = QDF_STATUS_E_CANCELED;
 			send_packet_completion(target, pPacket);
 		}
 	}
diff --git a/htc/htc_services.c b/htc/htc_services.c
index c8910d86d2dc..da5747faf7a8 100644
--- a/htc/htc_services.c
+++ b/htc/htc_services.c
@@ -95,12 +95,12 @@ htc_alt_data_credit_size_update(HTC_TARGET *target,
 }
 #endif
 
-A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
+QDF_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 			     struct htc_service_connect_req *pConnectReq,
 			     struct htc_service_connect_resp *pConnectResp)
 {
 	HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-	A_STATUS status = A_OK;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	HTC_PACKET *pSendPacket = NULL;
 	HTC_CONNECT_SERVICE_RESPONSE_MSG *pResponseMsg;
 	HTC_CONNECT_SERVICE_MSG *pConnectMsg;
@@ -145,7 +145,7 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 
 			if (NULL == pSendPacket) {
 				AR_DEBUG_ASSERT(false);
-				status = A_NO_MEMORY;
+				status = QDF_STATUS_E_NOMEM;
 				break;
 			}
 
@@ -163,7 +163,7 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 
 			if (NULL == pConnectMsg) {
 				AR_DEBUG_ASSERT(0);
-				status = A_EFAULT;
+				status = QDF_STATUS_E_FAULT;
 				break;
 			}
 
@@ -216,12 +216,12 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 			status = htc_send_pkt((HTC_HANDLE) target, pSendPacket);
 			/* we don't own it anymore */
 			pSendPacket = NULL;
-			if (A_FAILED(status))
+			if (QDF_IS_STATUS_ERROR(status))
 				break;
 
 			/* wait for response */
 			status = htc_wait_recv_ctrl_message(target);
-			if (A_FAILED(status))
+			if (QDF_IS_STATUS_ERROR(status))
 				break;
 			/* we controlled the buffer creation so it has to be
 			 * properly aligned
@@ -259,7 +259,7 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 				sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG))) {
 				/* this message is not valid */
 				AR_DEBUG_ASSERT(false);
-				status = A_EPROTO;
+				status = QDF_STATUS_E_PROTO;
 				break;
 			}
 
@@ -276,7 +276,7 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 						(" Target failed service 0x%X connect request (status:%d)\n",
 						 rsp_msg_serv_id,
 						 rsp_msg_status));
-				status = A_EPROTO;
+				status = QDF_STATUS_E_PROTO;
 /* TODO: restore the ifdef when FW supports services 301 and 302
  * (HTT_MSG_DATA[23]_MSG_SVC)
  */
@@ -313,7 +313,7 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 		}
 
 		/* rest of these are parameter checks so set the error status */
-		status = A_EPROTO;
+		status = QDF_STATUS_E_PROTO;
 
 		if (assignedEndpoint >= ENDPOINT_MAX) {
 			AR_DEBUG_ASSERT(false);
@@ -363,7 +363,7 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 						 &pEndpoint->DL_PipeID,
 						 &pEndpoint->ul_is_polled,
 						 &pEndpoint->dl_is_polled);
-		if (A_FAILED(status))
+		if (QDF_IS_STATUS_ERROR(status))
 			break;
 
 		htc_alt_data_credit_size_update(target,
diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c
index 7bca26100993..2eef15a95346 100644
--- a/wmi/src/wmi_unified.c
+++ b/wmi/src/wmi_unified.c
@@ -1289,7 +1289,7 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf,
 				uint32_t len, uint32_t cmd_id)
 {
 	HTC_PACKET *pkt;
-	A_STATUS status;
+	QDF_STATUS status;
 	uint16_t htc_tag = 0;
 
 	if (wmi_get_runtime_pm_inprogress(wmi_handle)) {
@@ -1380,15 +1380,13 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf,
 
 	status = htc_send_pkt(wmi_handle->htc_handle, pkt);
 
-	if (A_OK != status) {
+	if (QDF_STATUS_SUCCESS != status) {
 		qdf_atomic_dec(&wmi_handle->pending_cmds);
 		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 		   "%s %d, htc_send_pkt failed", __func__, __LINE__);
 		qdf_mem_free(pkt);
-
+		return status;
 	}
-	if (status)
-		return QDF_STATUS_E_FAILURE;
 
 	return QDF_STATUS_SUCCESS;
 }