staging: r8188eu: rename SetHwReg8188EU to rtw_hal_set_hwreg

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/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index 8e7605ef950ad01dcdfeb3ec27bd6e766fa802d8..2a65ac70212955fac783f0e217e122357c679f7b 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -1508,7 +1508,7 @@ void update_wireless_mode(struct adapter *padapter)
        SIFS_Timer = 0x0a0a0808;/* 0x0808 -> for CCK, 0x0a0a -> for OFDM */
                                /* change this value if having IOT issues. */
 
-       padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_RESP_SIFS,  (u8 *)&SIFS_Timer);
+       rtw_hal_set_hwreg(padapter, HW_VAR_RESP_SIFS,  (u8 *)&SIFS_Timer);
 
        if (pmlmeext->cur_wireless_mode & WIRELESS_11B)
                update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB);

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index 041208c8e9eeccc484f8daaac6e7b90a5792d8c8..373d788eff796689352996fb1e859dffad251f27 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -114,12 +114,6 @@ uint rtw_hal_deinit(struct adapter *adapt)
        return status;
 }
 
-void rtw_hal_set_hwreg(struct adapter *adapt, u8 variable, u8 *val)
-{
-       if (adapt->HalFunc.SetHwRegHandler)
-               adapt->HalFunc.SetHwRegHandler(adapt, variable, val);
-}
-
 void rtw_hal_set_odm_var(struct adapter *adapt,
                         enum hal_odm_variable var, void *val1,
                         bool set)

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index be5d0681408c8800f5281786bdf93d123ef5ea81..40654161087947de7f43bb46ae9bdcd66ef80214 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1276,7 +1276,7 @@ static void hw_var_set_bcn_func(struct adapter *Adapter, u8 variable, u8 *val)
                usb_write8(Adapter, bcn_ctrl_reg, usb_read8(Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION | EN_TXBCN_RPT)));
 }
 
-static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
+void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)
 {
        struct hal_data_8188e   *haldata = GET_HAL_DATA(Adapter);
        struct dm_priv  *pdmpriv = &haldata->dmpriv;
@@ -2079,7 +2079,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->intf_chip_configure = &rtl8188eu_interface_configure;
        halfunc->read_adapter_info = &_ReadAdapterInfo8188EU;
 
-       halfunc->SetHwRegHandler = &SetHwReg8188EU;
-
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 89f3fb83092e7b078950027f05e6d00c26109822..5ab50ab91d84c4ee8c9915ce4e3af51399cc1eb1 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -175,9 +175,6 @@ struct hal_ops {
 
        void    (*hal_dm_watchdog)(struct adapter *padapter);
 
-       void    (*SetHwRegHandler)(struct adapter *padapter, u8 variable,
-                                  u8 *val);
-
        void    (*SetHalODMVarHandler)(struct adapter *padapter,
                                       enum hal_odm_variable eVariable,
                                       void *pValue1, bool bSet);