staging: rtl8723au: rtw_sta_mgt.c: Clean up messy usage of return types

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_sta_mgt.c b/drivers/staging/rtl8723au/core/rtw_sta_mgt.c
index 148bb4a2de2fbbd2101349dc84360215788ab71e..f65d6d72624bf5c88154f5fb4196df83aa8685d2 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8723au/core/rtw_sta_mgt.c
@@ -49,7 +49,7 @@ static void _rtw_init_stainfo(struct sta_info *psta)
 #endif /*  CONFIG_8723AU_AP_MODE */
 }
 
-u32 _rtw_init_sta_priv23a(struct sta_priv *pstapriv)
+int _rtw_init_sta_priv23a(struct sta_priv *pstapriv)
 {
        int i;
 
@@ -77,12 +77,12 @@ u32 _rtw_init_sta_priv23a(struct sta_priv *pstapriv)
        return _SUCCESS;
 }
 
-u32    _rtw_free_sta_priv23a(struct    sta_priv *pstapriv)
+int _rtw_free_sta_priv23a(struct sta_priv *pstapriv)
 {
        struct list_head *phead, *plist, *ptmp;
        struct sta_info *psta;
        struct recv_reorder_ctrl *preorder_ctrl;
-       int     index;
+       int index;
 
        if (pstapriv) {
                /*      delete all reordering_ctrl_timer                */
@@ -186,7 +186,7 @@ exit:
 }
 
 /*  using pstapriv->sta_hash_lock to protect */
-u32 rtw_free_stainfo23a(struct rtw_adapter *padapter, struct sta_info *psta)
+int rtw_free_stainfo23a(struct rtw_adapter *padapter, struct sta_info *psta)
 {
        struct recv_reorder_ctrl *preorder_ctrl;
        struct  sta_xmit_priv   *pstaxmitpriv;
@@ -373,12 +373,12 @@ struct sta_info *rtw_get_stainfo23a(struct sta_priv *pstapriv, const u8 *hwaddr)
        return psta;
 }
 
-u32 rtw_init_bcmc_stainfo23a(struct rtw_adapter* padapter)
+int rtw_init_bcmc_stainfo23a(struct rtw_adapter* padapter)
 {
        struct  sta_priv *pstapriv = &padapter->stapriv;
        struct sta_info         *psta;
        struct tx_servq *ptxservq;
-       u32 res = _SUCCESS;
+       int res = _SUCCESS;
        unsigned char bcast_addr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
        psta = rtw_alloc_stainfo23a(pstapriv, bcast_addr, GFP_KERNEL);
@@ -405,13 +405,13 @@ struct sta_info *rtw_get_bcmc_stainfo23a(struct rtw_adapter *padapter)
        return psta;
 }
 
-u8 rtw_access_ctrl23a(struct rtw_adapter *padapter, u8 *mac_addr)
+bool rtw_access_ctrl23a(struct rtw_adapter *padapter, u8 *mac_addr)
 {
-       u8 res = true;
+       bool res = true;
 #ifdef CONFIG_8723AU_AP_MODE
        struct list_head *plist, *phead;
        struct rtw_wlan_acl_node *paclnode;
-       u8 match = false;
+       bool match = false;
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
        struct rtw_queue *pacl_node_q = &pacl_list->acl_node_q;

diff --git a/drivers/staging/rtl8723au/include/sta_info.h b/drivers/staging/rtl8723au/include/sta_info.h
index 10d933e0939b5604504679d38e5fe3e90878dff1..747e7db2113e3cd315b9e69ee8a5ab4f8c1f972b 100644 (file)
--- a/drivers/staging/rtl8723au/include/sta_info.h
+++ b/drivers/staging/rtl8723au/include/sta_info.h
@@ -359,15 +359,15 @@ static inline u32 wifi_mac_hash(const u8 *mac)
        return x;
 }
 
-u32    _rtw_init_sta_priv23a(struct sta_priv *pstapriv);
-u32    _rtw_free_sta_priv23a(struct sta_priv *pstapriv);
+int _rtw_init_sta_priv23a(struct sta_priv *pstapriv);
+int _rtw_free_sta_priv23a(struct sta_priv *pstapriv);
 
 struct sta_info *rtw_alloc_stainfo23a(struct sta_priv *pstapriv, u8 *hwaddr, int gfp);
-u32 rtw_free_stainfo23a(struct rtw_adapter *padapter, struct sta_info *psta);
+int rtw_free_stainfo23a(struct rtw_adapter *padapter, struct sta_info *psta);
 void rtw_free_all_stainfo23a(struct rtw_adapter *padapter);
 struct sta_info *rtw_get_stainfo23a(struct sta_priv *pstapriv, const u8 *hwaddr);
-u32 rtw_init_bcmc_stainfo23a(struct rtw_adapter *padapter);
+int rtw_init_bcmc_stainfo23a(struct rtw_adapter *padapter);
 struct sta_info *rtw_get_bcmc_stainfo23a(struct rtw_adapter *padapter);
-u8 rtw_access_ctrl23a(struct rtw_adapter *padapter, u8 *mac_addr);
+bool rtw_access_ctrl23a(struct rtw_adapter *padapter, u8 *mac_addr);
 
 #endif /* _STA_INFO_H_ */