staging: r8188eu: rename phy_sw_chnl to rtw_hal_set_chan

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 5b38fb41a10239f8c3586d022987a9bfcfc92bd9..5f4bf5f8d77e4d5c1d2a5c8ef0cfd2be5966c0d4 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -104,12 +104,6 @@ void rtw_hal_set_bwmode(struct adapter *adapt,
                                                     offset);
 }
 
-void rtw_hal_set_chan(struct adapter *adapt, u8 channel)
-{
-       if (adapt->HalFunc.set_channel_handler)
-               adapt->HalFunc.set_channel_handler(adapt, channel);
-}
-
 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 2b66c6d8d23adb0fc4c662865153c950fd7319e7..4856c24d80361e994b2501c8d19cedb340becacc 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -307,7 +307,7 @@ static void phy_sw_chnl_callback(struct adapter *adapt, u8 channel)
        }
 }
 
-void phy_sw_chnl(struct adapter *adapt, u8 channel)
+void rtw_hal_set_chan(struct adapter *adapt, u8 channel)
 {
        struct hal_data_8188e *hal_data = GET_HAL_DATA(adapt);
        u8 tmpchannel = hal_data->CurrentChannel;

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 90d1aa3f1d6c8877a40be23c1323ea83cf8f93da..2b15b11c51d2b50ff41aec456aa9f44976b4cf67 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -194,7 +194,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->read_chip_version = &ReadChipVersion8188E;
 
        pHalFunc->set_bwmode_handler = &phy_set_bw_mode;
-       pHalFunc->set_channel_handler = &phy_sw_chnl;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 0f04a8b38d40fef419e66ced7eb7690ca10de70b..8c15c58bbad1eb214478aba8bb2f2891d28d0e18 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -150,7 +150,6 @@ struct hal_ops {
        void    (*set_bwmode_handler)(struct adapter *padapter,
                                      enum ht_channel_width Bandwidth,
                                      u8 Offset);
-       void    (*set_channel_handler)(struct adapter *padapter, u8 channel);
 
        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 0b42fc1a993ef72c5f68a6f6cdb186318e27a335..463752090abe6b1dd2baf56e69e6acdd4b507e26 100644 (file)
--- a/drivers/staging/rtl8188eu/include/phy.h
+++ b/drivers/staging/rtl8188eu/include/phy.h
@@ -20,7 +20,6 @@ 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 phy_sw_chnl(struct adapter *adapt, u8 channel);
 
 void rtl88eu_dm_txpower_track_adjust(struct odm_dm_struct *dm_odm,
                                     u8 type, u8 *dir, u32 *out_write);