From 8e1e64bb66c5236153255a4ec2de77f21569c537 Mon Sep 17 00:00:00 2001 From: Mateusz Kulikowski Date: Sun, 19 Jul 2015 19:28:37 +0200 Subject: [PATCH] staging: rtl8192e: Rename hal_dm_watchdog Use naming schema found in other rtlwifi devices. Rename hal_dm_watchdog to rtl92e_dm_watchdog. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 9dc05caef4a7..2214e6d353c1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1438,7 +1438,7 @@ static void rtl819x_watchdog_wqcallback(void *data) priv->rtllib->CntAfterLink = 0; } - hal_dm_watchdog(dev); + rtl92e_dm_watchdog(dev); if (rtllib_act_scanning(priv->rtllib, false) == false) { if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index c79f8ab1f2c8..564b17c05d91 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -256,7 +256,7 @@ void rtl92e_dm_deinit(struct net_device *dev) } -void hal_dm_watchdog(struct net_device *dev) +void rtl92e_dm_watchdog(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h index 1fa0ff88896a..7147886e830f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -191,7 +191,7 @@ extern const u8 dm_cck_tx_bb_gain_ch14[CCKTxBBGainTableLength][8]; extern void init_hal_dm(struct net_device *dev); extern void rtl92e_dm_deinit(struct net_device *dev); -extern void hal_dm_watchdog(struct net_device *dev); +extern void rtl92e_dm_watchdog(struct net_device *dev); extern void init_rate_adaptive(struct net_device *dev); -- 2.39.5