staging: r8188eu: remove Add_RateATid from hal_ops

Remove Add_RateATid from hal_ops and remove its wrapper
rtw_hal_add_ra_tid(). Call rtl8188e_Add_RateATid() directly instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-14-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_ap.c b/drivers/staging/r8188eu/core/rtw_ap.c
index da8b533..8e6b196 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_ap.c
+++ b/drivers/staging/r8188eu/core/rtw_ap.c
@@ -7,6 +7,7 @@
 #include "../include/drv_types.h"
 #include "../include/wifi.h"
 #include "../include/ieee80211.h"
+#include "../include/rtl8188e_cmd.h"
 
 #ifdef CONFIG_88EU_AP_MODE
 
@@ -393,7 +394,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
                /* bitmap[28:31]= Rate Adaptive id */
                /* arg[0:4] = macid */
                /* arg[5] = Short GI */
-               rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, rssi_level);
+               rtl8188e_Add_RateATid(padapter, tx_ra_bitmap, arg, rssi_level);
 
                if (shortGIrate)
                        init_rate |= BIT(6);
@@ -467,7 +468,7 @@ void update_bmc_sta(struct adapter *padapter)
                        /* bitmap[28:31]= Rate Adaptive id */
                        /* arg[0:4] = macid */
                        /* arg[5] = Short GI */
-                       rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, 0);
+                       rtl8188e_Add_RateATid(padapter, tx_ra_bitmap, arg, 0);
                }
                /* set ra_id, init_rate */
                psta->raid = raid;

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 79a2a5a..39b1a87 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -158,14 +158,6 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)
        }
 }
 
-void rtw_hal_add_ra_tid(struct adapter *adapt, u32 bitmap, u8 arg,
-                       u8 rssi_level)
-{
-       if (adapt->HalFunc.Add_RateATid)
-               adapt->HalFunc.Add_RateATid(adapt, bitmap, arg,
-                                              rssi_level);
-}
-
 /*     Start specifical interface thread               */
 void rtw_hal_start_thread(struct adapter *adapt)
 {

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 4274b11..0b14748 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1784,7 +1784,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 {
        pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
 
-       pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid;
        pHalFunc->run_thread = &rtl8188e_start_thread;
        pHalFunc->cancel_thread = &rtl8188e_stop_thread;
 

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 3bf0d18..9f804f9 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -154,8 +154,6 @@ struct hal_ops {
                                       u32 mac_id, u8 rssi_level);
        void    (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter);
 
-       void    (*Add_RateATid)(struct adapter *adapter, u32 bitmap, u8 arg,
-                               u8 rssi_level);
        void    (*run_thread)(struct adapter *adapter);
        void    (*cancel_thread)(struct adapter *adapter);
 
@@ -257,7 +255,6 @@ s32 rtw_hal_init_recv_priv(struct adapter *padapter);
 void   rtw_hal_free_recv_priv(struct adapter *padapter);
 
 void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);
-void   rtw_hal_add_ra_tid(struct adapter *adapt, u32 bitmap, u8 arg, u8 level);
 void   rtw_hal_clone_data(struct adapter *dst_adapt,
                           struct adapter *src_adapt);
 void   rtw_hal_start_thread(struct adapter *padapter);