staging: r8188eu: rename rtl8188e_HalDmWatchDog to rtw_hal_dm_watchdog

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 7237b949d7e22daf50f1c9f9cc96a77da8ca0fcc..5b38fb41a10239f8c3586d022987a9bfcfc92bd9 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -110,12 +110,6 @@ void rtw_hal_set_chan(struct adapter *adapt, u8 channel)
                adapt->HalFunc.set_channel_handler(adapt, channel);
 }
 
-void rtw_hal_dm_watchdog(struct adapter *adapt)
-{
-       if (adapt->HalFunc.hal_dm_watchdog)
-               adapt->HalFunc.hal_dm_watchdog(adapt);
-}
-
 void rtw_hal_reset_security_engine(struct adapter *adapter)
 {
        if (adapter->HalFunc.hal_reset_security_engine)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index c4c8798dbf6e22fc222774ac918cd2cb6efdfc19..73d6827b8895ffb1bf79d0620a290db5af045eae 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -141,7 +141,7 @@ void rtl8188e_InitHalDm(struct adapter *Adapter)
        ODM_DMInit(dm_odm);
 }
 
-void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
+void rtw_hal_dm_watchdog(struct adapter *Adapter)
 {
        u8 hw_init_completed = false;
        struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);

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

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 893e10e63631a8de75197e96b32c36633ced5a4f..0f04a8b38d40fef419e66ced7eb7690ca10de70b 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -152,8 +152,6 @@ struct hal_ops {
                                      u8 Offset);
        void    (*set_channel_handler)(struct adapter *padapter, u8 channel);
 
-       void    (*hal_dm_watchdog)(struct adapter *padapter);
-
        void (*hal_reset_security_engine)(struct adapter *adapter);
 };
 

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_dm.h b/drivers/staging/rtl8188eu/include/rtl8188e_dm.h
index 4ef657b5c9d47acfb39e379c5a9a1555169ebeea..39e453c4eb9e4712217c2c5d1fe9b4a4951ae168 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_dm.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_dm.h
@@ -47,7 +47,6 @@ struct        dm_priv {
 
 void rtl8188e_init_dm_priv(struct adapter *adapt);
 void rtl8188e_InitHalDm(struct adapter *adapt);
-void rtl8188e_HalDmWatchDog(struct adapter *adapt);
 
 void AntDivCompare8188E(struct adapter *adapt, struct wlan_bssid_ex *dst,
                        struct wlan_bssid_ex *src);