From: Mateusz Kulikowski Date: Sun, 19 Jul 2015 17:33:58 +0000 (+0200) Subject: staging: rtl8192e: Rename init_hal_dm X-Git-Tag: v4.3-rc1~158^2~387 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab7435982254d26cbc9af225065e0a6a94566269;p=karo-tx-linux.git staging: rtl8192e: Rename init_hal_dm Use naming schema found in other rtlwifi devices. Rename init_hal_dm to rtl92e_dm_init. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 1a7b6c7c2a0e..f0e175def6a4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1093,7 +1093,7 @@ static short rtl8192_init(struct net_device *dev) priv->ops->init_adapter_variable(dev); rtl8192_get_channel_map(dev); - init_hal_dm(dev); + rtl92e_dm_init(dev); setup_timer(&priv->watch_dog_timer, watch_dog_timer_callback, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index b60003518d69..458097ee09e7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -224,7 +224,7 @@ static void dm_send_rssi_tofw(struct net_device *dev); static void dm_ctstoself(struct net_device *dev); /*---------------------------Define function prototype------------------------*/ -void init_hal_dm(struct net_device *dev) +void rtl92e_dm_init(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 e7a2dcf1785a..e16502d12cdc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -188,7 +188,7 @@ extern const u8 dm_cck_tx_bb_gain_ch14[CCKTxBBGainTableLength][8]; /*--------------------------Exported Function prototype---------------------*/ /*--------------------------Exported Function prototype---------------------*/ -extern void init_hal_dm(struct net_device *dev); +extern void rtl92e_dm_init(struct net_device *dev); extern void rtl92e_dm_deinit(struct net_device *dev); extern void rtl92e_dm_watchdog(struct net_device *dev);