[PATCH 53/63] staging: r8188eu: rename rtl8188e_HalDmWatchDog to rtw_hal_dm_watchdog

From: Ivan Safonov
Date: Sat Sep 03 2016 - 11:44:03 EST


And remove two one-line wrappers.

Signed-off-by: Ivan Safonov <insafonov@xxxxxxxxx>
---
drivers/staging/rtl8188eu/hal/hal_intf.c | 6 ------
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 --
drivers/staging/rtl8188eu/include/hal_intf.h | 2 --
drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 1 -
5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index 7237b94..5b38fb4 100644
--- 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 c4c8798..73d6827 100644
--- 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 b2928a5..90d1aa3 100644
--- 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 893e10e..0f04a8b 100644
--- 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 4ef657b..39e453c 100644
--- 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);
--
2.7.3