From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Date: Sun, 19 Jul 2015 17:27:19 +0000 (+0200)
Subject: staging: rtl8192e: Rename rtl8192_adapter_start
X-Git-Tag: firefly_0821_release~176^2~1221^2~483
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=460266292de1c3770bad54f48e5b33a5fed342e1;p=firefly-linux-kernel-4.4.55.git
staging: rtl8192e: Rename rtl8192_adapter_start
Use naming schema found in other rtlwifi devices.
Rename rtl8192_adapter_start to rtl92e_start_adapter.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index eb919b634e3c..2bc53ad2b4c7 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -702,7 +702,7 @@ static void rtl8192_hwconfig(struct net_device *dev)
priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
}
-bool rtl8192_adapter_start(struct net_device *dev)
+bool rtl92e_start_adapter(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
u32 ulRegRead;
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
index 4f1b312e90f4..48fbd4e516f6 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
@@ -42,7 +42,7 @@ void rtl8192_InitializeVariables(struct net_device *dev);
void rtl8192e_start_beacon(struct net_device *dev);
void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val);
void rtl8192_get_eeprom_size(struct net_device *dev);
-bool rtl8192_adapter_start(struct net_device *dev);
+bool rtl92e_start_adapter(struct net_device *dev);
void rtl8192_link_change(struct net_device *dev);
void rtl8192_AllowAllDestAddr(struct net_device *dev, bool bAllowAllDA,
bool WriteIntoReg);
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index ca8406bba26d..c5028cc01f34 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -46,7 +46,7 @@ static struct rtl819x_ops rtl819xp_ops = {
.nic_type = NIC_8192E,
.get_eeprom_size = rtl8192_get_eeprom_size,
.init_adapter_variable = rtl8192_InitializeVariables,
- .initialize_adapter = rtl8192_adapter_start,
+ .initialize_adapter = rtl92e_start_adapter,
.link_change = rtl8192_link_change,
.tx_fill_descriptor = rtl8192_tx_fill_desc,
.tx_fill_cmd_descriptor = rtl8192_tx_fill_cmd_desc,