From ca15415988fc0eac6fc6bf5dd3113d37eee0356f Mon Sep 17 00:00:00 2001 From: Balamurugan Mahalingam Date: Wed, 18 Jul 2018 17:14:58 +0530 Subject: [PATCH] qcacmn: make hal target specific functions as static This is needed to fix a compilation warning reported as error due to Werror gcc option Change-Id: I1ffab78b01266d5d0dabd843a03d44fc6b56b477 --- hal/wifi3.0/qca6290/hal_6290_rx.h | 7 ++++--- hal/wifi3.0/qca6290/hal_6290_tx.h | 15 +++++++-------- hal/wifi3.0/qca6390/hal_6390_rx.h | 12 ++++++------ hal/wifi3.0/qca6390/hal_6390_tx.h | 14 ++++++-------- hal/wifi3.0/qca8074/hal_8074_rx.h | 5 +++-- hal/wifi3.0/qca8074/hal_8074_tx.h | 11 +++++------ 6 files changed, 31 insertions(+), 33 deletions(-) diff --git a/hal/wifi3.0/qca6290/hal_6290_rx.h b/hal/wifi3.0/qca6290/hal_6290_rx.h index f1ffd978b233..22e9dc390c55 100644 --- a/hal/wifi3.0/qca6290/hal_6290_rx.h +++ b/hal/wifi3.0/qca6290/hal_6290_rx.h @@ -80,8 +80,8 @@ hal_rx_msdu_start_nss_get_6290(uint8_t *buf) * * Return: void */ -void hal_rx_mon_hw_desc_get_mpdu_status_6290(void *hw_desc_addr, - struct mon_rx_status *rs) +static void hal_rx_mon_hw_desc_get_mpdu_status_6290(void *hw_desc_addr, + struct mon_rx_status *rs) { struct rx_msdu_start *rx_msdu_start; struct rx_pkt_tlvs *rx_desc = (struct rx_pkt_tlvs *)hw_desc_addr; @@ -128,7 +128,7 @@ void hal_rx_mon_hw_desc_get_mpdu_status_6290(void *hw_desc_addr, #define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2) -uint32_t hal_get_link_desc_size_6290(void) +static uint32_t hal_get_link_desc_size_6290(void) { return LINK_DESC_SIZE; } @@ -153,6 +153,7 @@ static uint8_t hal_rx_get_tlv_6290(void *rx_tlv) * * Return: None */ +static void hal_rx_proc_phyrx_other_receive_info_tlv_6290(void *rx_tlv_hdr, void *ppdu_info_handle) { diff --git a/hal/wifi3.0/qca6290/hal_6290_tx.h b/hal/wifi3.0/qca6290/hal_6290_tx.h index d429d94e2f0c..c75757e0c483 100644 --- a/hal/wifi3.0/qca6290/hal_6290_tx.h +++ b/hal/wifi3.0/qca6290/hal_6290_tx.h @@ -47,8 +47,8 @@ * * Return: void */ -void hal_tx_desc_set_dscp_tid_table_id_6290(void *desc, - uint8_t id) +static void hal_tx_desc_set_dscp_tid_table_id_6290(void *desc, + uint8_t id) { HAL_SET_FLD(desc, TCL_DATA_CMD_5, DSCP_TID_TABLE_NUM) |= @@ -70,8 +70,8 @@ void hal_tx_desc_set_dscp_tid_table_id_6290(void *desc, * * Return: none */ -void hal_tx_set_dscp_tid_map_6290(void *hal_soc, uint8_t *map, - uint8_t id) +static void hal_tx_set_dscp_tid_map_6290(void *hal_soc, uint8_t *map, + uint8_t id) { int i; uint32_t addr, cmn_reg_addr; @@ -137,8 +137,8 @@ void hal_tx_set_dscp_tid_map_6290(void *hal_soc, uint8_t *map, * * Return: void */ -void hal_tx_update_dscp_tid_6290(void *hal_soc, uint8_t tid, - uint8_t id, uint8_t dscp) +static void hal_tx_update_dscp_tid_6290(void *hal_soc, uint8_t tid, + uint8_t id, uint8_t dscp) { int index; uint32_t addr; @@ -171,8 +171,7 @@ void hal_tx_update_dscp_tid_6290(void *hal_soc, uint8_t tid, * * Return: void */ -void hal_tx_desc_set_lmac_id_6290(void *desc, - uint8_t lmac_id) +static void hal_tx_desc_set_lmac_id_6290(void *desc, uint8_t lmac_id) { HAL_SET_FLD(desc, TCL_DATA_CMD_4, LMAC_ID) |= HAL_TX_SM(TCL_DATA_CMD_4, LMAC_ID, lmac_id); diff --git a/hal/wifi3.0/qca6390/hal_6390_rx.h b/hal/wifi3.0/qca6390/hal_6390_rx.h index 3646dab8db35..a08b5857498c 100644 --- a/hal/wifi3.0/qca6390/hal_6390_rx.h +++ b/hal/wifi3.0/qca6390/hal_6390_rx.h @@ -80,8 +80,8 @@ hal_rx_msdu_start_nss_get_6390(uint8_t *buf) * * Return: void */ -void hal_rx_mon_hw_desc_get_mpdu_status_6390(void *hw_desc_addr, - struct mon_rx_status *rs) +static void hal_rx_mon_hw_desc_get_mpdu_status_6390(void *hw_desc_addr, + struct mon_rx_status *rs) { struct rx_msdu_start *rx_msdu_start; struct rx_pkt_tlvs *rx_desc = (struct rx_pkt_tlvs *)hw_desc_addr; @@ -128,7 +128,7 @@ void hal_rx_mon_hw_desc_get_mpdu_status_6390(void *hw_desc_addr, #define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2) -uint32_t hal_get_link_desc_size_6390(void) +static uint32_t hal_get_link_desc_size_6390(void) { return LINK_DESC_SIZE; } @@ -152,6 +152,7 @@ static uint8_t hal_rx_get_tlv_6390(void *rx_tlv) * * Return: None */ +static void hal_rx_proc_phyrx_other_receive_info_tlv_6390(void *rx_tlv_hdr, void *ppdu_info_handle) { @@ -189,7 +190,7 @@ void hal_rx_proc_phyrx_other_receive_info_tlv_6390(void *rx_tlv_hdr, * * Return: void */ -void hal_rx_dump_msdu_start_tlv_6390(void *msdustart, uint8_t dbg_level) +static void hal_rx_dump_msdu_start_tlv_6390(void *msdustart, uint8_t dbg_level) { struct rx_msdu_start *msdu_start = (struct rx_msdu_start *)msdustart; @@ -425,8 +426,7 @@ uint32_t hal_rx_msdu_start_reception_type_get_6390(uint8_t *buf) * @ buf: pointer to the start of RX PKT TLV headers * Return: da index */ -static -uint16_t hal_rx_msdu_end_da_idx_get_6390(uint8_t *buf) +static uint16_t hal_rx_msdu_end_da_idx_get_6390(uint8_t *buf) { struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; diff --git a/hal/wifi3.0/qca6390/hal_6390_tx.h b/hal/wifi3.0/qca6390/hal_6390_tx.h index 5c1b7e9b1bde..b94b31915aa6 100644 --- a/hal/wifi3.0/qca6390/hal_6390_tx.h +++ b/hal/wifi3.0/qca6390/hal_6390_tx.h @@ -47,8 +47,7 @@ * * Return: void */ -void hal_tx_desc_set_dscp_tid_table_id_6390(void *desc, - uint8_t id) +static void hal_tx_desc_set_dscp_tid_table_id_6390(void *desc, uint8_t id) { HAL_SET_FLD(desc, TCL_DATA_CMD_5, DSCP_TID_TABLE_NUM) |= @@ -70,8 +69,8 @@ void hal_tx_desc_set_dscp_tid_table_id_6390(void *desc, * * Return: none */ -void hal_tx_set_dscp_tid_map_6390(void *hal_soc, uint8_t *map, - uint8_t id) +static void hal_tx_set_dscp_tid_map_6390(void *hal_soc, uint8_t *map, + uint8_t id) { int i; uint32_t addr, cmn_reg_addr; @@ -137,8 +136,8 @@ void hal_tx_set_dscp_tid_map_6390(void *hal_soc, uint8_t *map, * * Return: void */ -void hal_tx_update_dscp_tid_6390(void *hal_soc, uint8_t tid, - uint8_t id, uint8_t dscp) +static void hal_tx_update_dscp_tid_6390(void *hal_soc, uint8_t tid, + uint8_t id, uint8_t dscp) { int index; uint32_t addr; @@ -171,8 +170,7 @@ void hal_tx_update_dscp_tid_6390(void *hal_soc, uint8_t tid, * * Return: void */ -void hal_tx_desc_set_lmac_id_6390(void *desc, - uint8_t lmac_id) +static void hal_tx_desc_set_lmac_id_6390(void *desc, uint8_t lmac_id) { HAL_SET_FLD(desc, TCL_DATA_CMD_4, LMAC_ID) |= HAL_TX_SM(TCL_DATA_CMD_4, LMAC_ID, lmac_id); diff --git a/hal/wifi3.0/qca8074/hal_8074_rx.h b/hal/wifi3.0/qca8074/hal_8074_rx.h index 4223561958ce..862aa00b2622 100644 --- a/hal/wifi3.0/qca8074/hal_8074_rx.h +++ b/hal/wifi3.0/qca8074/hal_8074_rx.h @@ -63,8 +63,8 @@ hal_rx_msdu_start_nss_get_8074(uint8_t *buf) * * Return: void */ -void hal_rx_mon_hw_desc_get_mpdu_status_8074(void *hw_desc_addr, - struct mon_rx_status *rs) +static void hal_rx_mon_hw_desc_get_mpdu_status_8074(void *hw_desc_addr, + struct mon_rx_status *rs) { struct rx_msdu_start *rx_msdu_start; struct rx_pkt_tlvs *rx_desc = (struct rx_pkt_tlvs *)hw_desc_addr; @@ -134,6 +134,7 @@ static uint8_t hal_rx_get_tlv_8074(void *rx_tlv) * * Return: None */ +static void hal_rx_proc_phyrx_other_receive_info_tlv_8074(void *rx_tlv_hdr, void *ppdu_info) { diff --git a/hal/wifi3.0/qca8074/hal_8074_tx.h b/hal/wifi3.0/qca8074/hal_8074_tx.h index 7f25c804fe6c..4dd77022d81b 100644 --- a/hal/wifi3.0/qca8074/hal_8074_tx.h +++ b/hal/wifi3.0/qca8074/hal_8074_tx.h @@ -45,8 +45,7 @@ * Return: void */ -void hal_tx_desc_set_dscp_tid_table_id_8074(void *desc, - uint8_t id) +static void hal_tx_desc_set_dscp_tid_table_id_8074(void *desc, uint8_t id) { HAL_SET_FLD(desc, TCL_DATA_CMD_3, DSCP_TO_TID_PRIORITY_TABLE_ID) |= @@ -67,8 +66,8 @@ void hal_tx_desc_set_dscp_tid_table_id_8074(void *desc, * * Return: none */ -void hal_tx_set_dscp_tid_map_8074(void *hal_soc, uint8_t *map, - uint8_t id) +static void hal_tx_set_dscp_tid_map_8074(void *hal_soc, uint8_t *map, + uint8_t id) { int i; uint32_t addr; @@ -114,6 +113,7 @@ void hal_tx_set_dscp_tid_map_8074(void *hal_soc, uint8_t *map, * * Return: void */ +static void hal_tx_update_dscp_tid_8074(void *hal_soc, uint8_t tid, uint8_t id, uint8_t dscp) { @@ -157,7 +157,6 @@ void hal_tx_update_dscp_tid_8074(void *hal_soc, uint8_t tid, * * Return: void */ -void hal_tx_desc_set_lmac_id_8074(void *desc, - uint8_t lmac_id) +static void hal_tx_desc_set_lmac_id_8074(void *desc, uint8_t lmac_id) { }