staging: r8188eu: rename SetBeaconRelatedRegisters8188EUsb to rtw_hal_bcn_related_reg...

And remove many 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 18b43aa837d3526acfe70f4625f0e2a70244cc65..514cbd1bcbed81d8dff9c7f59b107ec10e88d5c4 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -243,12 +243,6 @@ void rtw_hal_dm_watchdog(struct adapter *adapt)
                adapt->HalFunc.hal_dm_watchdog(adapt);
 }
 
-void rtw_hal_bcn_related_reg_setting(struct adapter *adapt)
-{
-       if (adapt->HalFunc.SetBeaconRelatedRegistersHandler)
-               adapt->HalFunc.SetBeaconRelatedRegistersHandler(adapt);
-}
-
 u8 rtw_hal_antdiv_before_linked(struct adapter *adapt)
 {
        if (adapt->HalFunc.AntDivBeforeLinkHandler)

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index f7ac68bc5ee9038c69e8f80f6c63bc17a6540a28..d64940a5183929e791c66dcf13618ba04cff5b6d 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1996,7 +1996,7 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_l
        psta->init_rate = init_rate;
 }
 
-static void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt)
+void rtw_hal_bcn_related_reg_setting(struct adapter *adapt)
 {
        u32 value32;
        struct mlme_ext_priv    *pmlmeext = &adapt->mlmeextpriv;
@@ -2085,7 +2085,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;
 
        halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;
-       halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb;
 
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 5b882f6b5ac1934b6b326770ef380d3b3df59bda..188f58458c37f48278bd52a7f657d2d3306f24b8 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -190,7 +190,6 @@ struct hal_ops {
 
        void    (*UpdateRAMaskHandler)(struct adapter *padapter,
                                       u32 mac_id, u8 rssi_level);
-       void    (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter);
 
        void    (*Add_RateATid)(struct adapter *adapter, u32 bitmap, u8 arg,
                                u8 rssi_level);