staging: r8188eu: rename phy_set_bw_mode to rtw_hal_set_bwmode

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 5f4bf5f8d77e4d5c1d2a5c8ef0cfd2be5966c0d4..daed450cf880e7606f690f02d0bf6360c2ca0133 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_set_bwmode(struct adapter *adapt,
-                       enum ht_channel_width bandwidth, u8 offset)
-{
-       if (adapt->HalFunc.set_bwmode_handler)
-               adapt->HalFunc.set_bwmode_handler(adapt, bandwidth,
-                                                    offset);
-}
-
 void rtw_hal_reset_security_engine(struct adapter *adapter)
 {
        if (adapter->HalFunc.hal_reset_security_engine)

diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 4856c24d80361e994b2501c8d19cedb340becacc..776e5b83b99ffaaf340e0794353d67c5889cfbd7 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -274,7 +274,7 @@ static void phy_set_bw_mode_callback(struct adapter *adapt)
                rtl88eu_phy_rf6052_set_bandwidth(adapt, hal_data->CurrentChannelBW);
 }
 
-void phy_set_bw_mode(struct adapter *adapt, enum ht_channel_width bandwidth,
+void rtw_hal_set_bwmode(struct adapter *adapt, enum ht_channel_width bandwidth,
                     unsigned char offset)
 {
        struct hal_data_8188e   *hal_data = GET_HAL_DATA(adapt);

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 2b15b11c51d2b50ff41aec456aa9f44976b4cf67..75eda92306a5c64bc940032f0a422177e7aa38ea 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -192,8 +192,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->dm_init = &rtl8188e_init_dm_priv;
 
        pHalFunc->read_chip_version = &ReadChipVersion8188E;
-
-       pHalFunc->set_bwmode_handler = &phy_set_bw_mode;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 8c15c58bbad1eb214478aba8bb2f2891d28d0e18..d3243efd0a60fc1df4627722317d0843f6f11379 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -147,10 +147,6 @@ struct hal_ops {
 
        s32     (*interrupt_handler)(struct adapter *padapter);
 
-       void    (*set_bwmode_handler)(struct adapter *padapter,
-                                     enum ht_channel_width Bandwidth,
-                                     u8 Offset);
-
        void (*hal_reset_security_engine)(struct adapter *adapter);
 };
 

diff --git a/drivers/staging/rtl8188eu/include/phy.h b/drivers/staging/rtl8188eu/include/phy.h
index 463752090abe6b1dd2baf56e69e6acdd4b507e26..cd387e998574ebad7c5b6655ec51c5261f8f5821 100644 (file)
--- a/drivers/staging/rtl8188eu/include/phy.h
+++ b/drivers/staging/rtl8188eu/include/phy.h
@@ -18,9 +18,6 @@ void phy_set_rf_reg(struct adapter *adapt, enum rf_radio_path rf_path,
 
 void phy_set_tx_power_level(struct adapter *adapt, u8 channel);
 
-void phy_set_bw_mode(struct adapter *adapt, enum ht_channel_width bandwidth,
-                    unsigned char offset);
-
 void rtl88eu_dm_txpower_track_adjust(struct odm_dm_struct *dm_odm,
                                     u8 type, u8 *dir, u32 *out_write);