From 7fb7a1f85013157f1d7ca102b2f5108f75b7b4c2 Mon Sep 17 00:00:00 2001 From: Rakesh Pillai Date: Fri, 23 Jun 2017 14:46:36 +0530 Subject: [PATCH] qcacld-3.0: Fix CLANG warnings in Data path implicit conversion from enumeration type 'QDF_STATUS' to different enumeration type 'A_STATUS' implicit conversion from enumeration type 'A_STATUS' to different enumeration type 'QDF_STATUS' CRs-Fixed: 2063339 Change-Id: Ib96a49f40ea581127405560087354e7fa9bf46ec --- core/dp/htt/htt.c | 20 ++++++++++---------- core/dp/htt/htt_h2t.c | 36 ++++++++++++++++++------------------ core/dp/htt/htt_internal.h | 4 ++-- core/dp/htt/htt_t2h.c | 4 ++-- core/dp/ol/inc/ol_htt_api.h | 2 +- core/dp/txrx/ol_txrx.c | 2 +- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index 48c38831ed34..b5b1226935f8 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -54,9 +54,9 @@ QDF_STATUS(*htt_h2t_rx_ring_cfg_msg)(struct htt_pdev_t *pdev); QDF_STATUS(*htt_h2t_rx_ring_rfs_cfg_msg)(struct htt_pdev_t *pdev); #ifdef IPA_OFFLOAD -static A_STATUS htt_ipa_config(htt_pdev_handle pdev, A_STATUS status) +static QDF_STATUS htt_ipa_config(htt_pdev_handle pdev, QDF_STATUS status) { - if ((A_OK == status) && + if ((QDF_STATUS_SUCCESS == status) && ol_cfg_ipa_uc_offload_enabled(pdev->ctrl_pdev)) status = htt_h2t_ipa_uc_rsc_cfg_msg(pdev); return status; @@ -220,7 +220,7 @@ htt_htc_tx_htt2_service_start(struct htt_pdev_t *pdev, struct htc_service_connect_req *connect_req, struct htc_service_connect_resp *connect_resp) { - A_STATUS status; + QDF_STATUS status; qdf_mem_set(connect_req, 0, sizeof(struct htc_service_connect_req)); qdf_mem_set(connect_resp, 0, sizeof(struct htc_service_connect_resp)); @@ -240,7 +240,7 @@ htt_htc_tx_htt2_service_start(struct htt_pdev_t *pdev, status = htc_connect_service(pdev->htc_pdev, connect_req, connect_resp); - if (status != A_OK) { + if (status != QDF_STATUS_SUCCESS) { pdev->htc_tx_htt2_endpoint = ENDPOINT_UNUSED; pdev->htc_tx_htt2_max_size = 0; } else { @@ -249,7 +249,7 @@ htt_htc_tx_htt2_service_start(struct htt_pdev_t *pdev, } qdf_print("TX HTT %s, ep %d size %d\n", - (status == A_OK ? "ON" : "OFF"), + (status == QDF_STATUS_SUCCESS ? "ON" : "OFF"), pdev->htc_tx_htt2_endpoint, pdev->htc_tx_htt2_max_size); } @@ -593,12 +593,12 @@ fail1: return ret; } -A_STATUS htt_attach_target(htt_pdev_handle pdev) +QDF_STATUS htt_attach_target(htt_pdev_handle pdev) { - A_STATUS status; + QDF_STATUS status; status = htt_h2t_ver_req_msg(pdev); - if (status != A_OK) + if (status != QDF_STATUS_SUCCESS) return status; #if defined(HELIUMPLUS) @@ -696,7 +696,7 @@ int htt_htc_attach(struct htt_pdev_t *pdev, uint16_t service_id) { struct htc_service_connect_req connect; struct htc_service_connect_resp response; - A_STATUS status; + QDF_STATUS status; qdf_mem_set(&connect, sizeof(connect), 0); qdf_mem_set(&response, sizeof(response), 0); @@ -729,7 +729,7 @@ int htt_htc_attach(struct htt_pdev_t *pdev, uint16_t service_id) status = htc_connect_service(pdev->htc_pdev, &connect, &response); - if (status != A_OK) { + if (status != QDF_STATUS_SUCCESS) { if (!cds_is_fw_down()) QDF_BUG(0); diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index 16d93b44041b..3e8b3ecebfc7 100644 --- a/core/dp/htt/htt_h2t.c +++ b/core/dp/htt/htt_h2t.c @@ -64,7 +64,7 @@ #ifdef ATH_11AC_TXCOMPACT #define HTT_SEND_HTC_PKT(pdev, pkt) \ do { \ - if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == A_OK) \ + if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == QDF_STATUS_SUCCESS) \ htt_htc_misc_pkt_list_add(pdev, pkt); \ } while (0) #else @@ -74,7 +74,7 @@ do { \ static void -htt_h2t_send_complete_free_netbuf(void *pdev, A_STATUS status, +htt_h2t_send_complete_free_netbuf(void *pdev, QDF_STATUS status, qdf_nbuf_t netbuf, uint16_t msdu_id) { qdf_nbuf_free(netbuf); @@ -82,7 +82,7 @@ htt_h2t_send_complete_free_netbuf(void *pdev, A_STATUS status, void htt_h2t_send_complete(void *context, HTC_PACKET *htc_pkt) { - void (*send_complete_part2)(void *pdev, A_STATUS status, + void (*send_complete_part2)(void *pdev, QDF_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id); struct htt_pdev_t *pdev = (struct htt_pdev_t *)context; struct htt_htc_pkt *htt_pkt; @@ -121,9 +121,9 @@ enum htc_send_full_action htt_h2t_full(void *context, HTC_PACKET *pkt) } #if defined(HELIUMPLUS) -A_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) +QDF_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) { - A_STATUS rc = A_OK; + QDF_STATUS rc = QDF_STATUS_SUCCESS; struct htt_htc_pkt *pkt; qdf_nbuf_t msg; @@ -132,7 +132,7 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(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 * (not required, but helpful) @@ -147,7 +147,7 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(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 */ } /* @@ -205,7 +205,7 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) rc = htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt); #ifdef ATH_11AC_TXCOMPACT - if (rc == A_OK) + if (rc == QDF_STATUS_SUCCESS) htt_htc_misc_pkt_list_add(pdev, pkt); #endif @@ -214,7 +214,7 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) #endif /* defined(HELIUMPLUS) */ -A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) +QDF_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) { struct htt_htc_pkt *pkt; qdf_nbuf_t msg; @@ -224,7 +224,7 @@ A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) pkt = htt_htc_pkt_alloc(pdev); if (!pkt) - return A_ERROR; /* failure */ + return QDF_STATUS_E_FAILURE; /* failure */ max_tx_group = ol_tx_get_max_tx_groups_supported(pdev->txrx_pdev); @@ -246,7 +246,7 @@ A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) true); if (!msg) { htt_htc_pkt_free(pdev, pkt); - return A_ERROR; /* failure */ + return QDF_STATUS_E_FAILURE; /* failure */ } /* @@ -291,7 +291,7 @@ A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) (!pdev->cfg.default_tx_comp_req)) ol_tx_target_credit_update(pdev->txrx_pdev, -1); - return A_OK; + return QDF_STATUS_SUCCESS; } #if defined(HELIUMPLUS) @@ -388,7 +388,7 @@ QDF_STATUS htt_h2t_rx_ring_cfg_msg_ll(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 @@ -404,7 +404,7 @@ QDF_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) 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. @@ -585,7 +585,7 @@ QDF_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg); HTT_SEND_HTC_PKT(pdev, pkt); - return A_OK; + return QDF_STATUS_SUCCESS; } QDF_STATUS @@ -719,7 +719,7 @@ htt_h2t_rx_ring_cfg_msg_hl(struct htt_pdev_t *pdev) SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg); #ifdef ATH_11AC_TXCOMPACT - if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == A_OK) + if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == QDF_STATUS_SUCCESS) htt_htc_misc_pkt_list_add(pdev, pkt); #else htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt); @@ -830,7 +830,7 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev, SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg); #ifdef ATH_11AC_TXCOMPACT - if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == A_OK) + if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == QDF_STATUS_SUCCESS) htt_htc_misc_pkt_list_add(pdev, pkt); #else htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt); @@ -955,7 +955,7 @@ htt_h2t_aggr_cfg_msg(struct htt_pdev_t *pdev, SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msg); #ifdef ATH_11AC_TXCOMPACT - if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == A_OK) + if (htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt) == QDF_STATUS_SUCCESS) htt_htc_misc_pkt_list_add(pdev, pkt); #else htc_send_pkt(pdev->htc_pdev, &pkt->htc_pkt); diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index d4d6b37eb81a..0806066ca1e2 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -523,10 +523,10 @@ static inline void htt_t2h_msg_handler_fast(void *htt_pdev, void htt_h2t_send_complete(void *context, HTC_PACKET *pkt); -A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev); +QDF_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev); #if defined(HELIUMPLUS) -A_STATUS +QDF_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev); #endif /* defined(HELIUMPLUS) */ diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 2ff8b4e36150..fdd4baac3ca2 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -561,8 +561,8 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) enum htt_t2h_msg_type msg_type; /* check for successful message reception */ - if (pkt->Status != A_OK) { - if (pkt->Status != A_ECANCELED) + if (pkt->Status != QDF_STATUS_SUCCESS) { + if (pkt->Status != QDF_STATUS_E_CANCELED) pdev->stats.htc_err_cnt++; qdf_nbuf_free(htt_t2h_msg); return; diff --git a/core/dp/ol/inc/ol_htt_api.h b/core/dp/ol/inc/ol_htt_api.h index 9875791358de..e7f3e8df5484 100644 --- a/core/dp/ol/inc/ol_htt_api.h +++ b/core/dp/ol/inc/ol_htt_api.h @@ -85,7 +85,7 @@ htt_attach(struct htt_pdev_t *pdev, int desc_pool_size); * * @param htt_pdev - handle to the HTT instance being initialized */ -A_STATUS htt_attach_target(htt_pdev_handle htt_pdev); +QDF_STATUS htt_attach_target(htt_pdev_handle htt_pdev); /** * enum htt_op_mode - Virtual device operation mode diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 136a94dc8c03..d75139fb80f7 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1755,7 +1755,7 @@ ol_attach_fail: static A_STATUS ol_txrx_pdev_attach_target(struct cdp_pdev *ppdev) { struct ol_txrx_pdev_t *pdev = (struct ol_txrx_pdev_t *)ppdev; - return htt_attach_target(pdev->htt_pdev) == A_OK ? 0:1; + return htt_attach_target(pdev->htt_pdev) == QDF_STATUS_SUCCESS ? 0:1; } /**