staging: r8188eu: rename rtl8188e_Add_RateATid to rtw_hal_add_ra_tid

And remove two one-line wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index bd5159cfc401478b97c5958f1cc823e43e7ed51d..7237b949d7e22daf50f1c9f9cc96a77da8ca0fcc 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -96,14 +96,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);
-}
-
 void rtw_hal_set_bwmode(struct adapter *adapt,
                        enum ht_channel_width bandwidth, u8 offset)
 {

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
index 40a0114c3b869ead6bd32525a35b5d0151e4e1db..18f69b83506f4ee0c7a32a63a89ee4bbe7144d3b 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
@@ -126,7 +126,7 @@ exit:
 /* bitmap[28:31]= Rate Adaptive id */
 /* arg[0:4] = macid */
 /* arg[5] = Short GI */
-void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level)
+void rtw_hal_add_ra_tid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level)
 {
        struct hal_data_8188e *haldata = GET_HAL_DATA(pAdapter);
 

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 6facf4baaa476a5a424199923817fc6a6b0bf45a..b2928a58ed1b9af99170838097e8d5eef95b23c2 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -197,8 +197,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->set_channel_handler = &phy_sw_chnl;
 
        pHalFunc->hal_dm_watchdog = &rtl8188e_HalDmWatchDog;
-
-       pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index c79fa9c2c0066fd2b15a475ce470aa4394be8419..893e10e63631a8de75197e96b32c36633ced5a4f 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -154,9 +154,6 @@ struct hal_ops {
 
        void    (*hal_dm_watchdog)(struct adapter *padapter);
 
-       void    (*Add_RateATid)(struct adapter *adapter, u32 bitmap, u8 arg,
-                               u8 rssi_level);
-
        void (*hal_reset_security_engine)(struct adapter *adapter);
 };
 

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_cmd.h b/drivers/staging/rtl8188eu/include/rtl8188e_cmd.h
index 820c04529e528553f6919c871fb559645df13bb3..042b4ec656c889446915b2bd3c57e18d66d3337c 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_cmd.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_cmd.h
@@ -72,8 +72,6 @@ struct rsvdpage_loc {
 /*  host message to firmware cmd */
 void rtl8188e_set_FwPwrMode_cmd(struct adapter *padapter, u8 Mode);
 void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus);
-void rtl8188e_Add_RateATid(struct adapter *padapter, u32 bitmap, u8 arg,
-                          u8 rssi_level);
 
 void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt);