staging: rtl8192e: Rename rtl8192_phy_ConfigRFWithHeaderFile

Use naming schema found in other rtlwifi devices.
Rename rtl8192_phy_ConfigRFWithHeaderFile to rtl92e_config_rf_path.

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/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
index 1482a286a2d673b1a80a2488d6d67911e857faec..9ed8637c7249c6e9a02e2748edb78be7bb8dd5ba 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
@@ -141,7 +141,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                case RF90_PATH_A:
                        while (RF3_Final_Value != RegValueToBeCheck &&
                               RetryTimes != 0) {
-                               ret = rtl8192_phy_ConfigRFWithHeaderFile(dev,
+                               ret = rtl92e_config_rf_path(dev,
                                                (enum rf90_radio_path)eRFPath);
                                RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
                                                 (enum rf90_radio_path)eRFPath,
@@ -157,7 +157,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                case RF90_PATH_B:
                        while (RF3_Final_Value != RegValueToBeCheck &&
                               RetryTimes != 0) {
-                               ret = rtl8192_phy_ConfigRFWithHeaderFile(dev,
+                               ret = rtl92e_config_rf_path(dev,
                                                (enum rf90_radio_path)eRFPath);
                                RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
                                                 (enum rf90_radio_path)eRFPath,
@@ -173,7 +173,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                case RF90_PATH_C:
                        while (RF3_Final_Value != RegValueToBeCheck &&
                               RetryTimes != 0) {
-                               ret = rtl8192_phy_ConfigRFWithHeaderFile(dev,
+                               ret = rtl92e_config_rf_path(dev,
                                                (enum rf90_radio_path)eRFPath);
                                RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
                                                (enum rf90_radio_path)eRFPath,
@@ -189,7 +189,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                case RF90_PATH_D:
                        while (RF3_Final_Value != RegValueToBeCheck &&
                               RetryTimes != 0) {
-                               ret = rtl8192_phy_ConfigRFWithHeaderFile(dev,
+                               ret = rtl92e_config_rf_path(dev,
                                               (enum rf90_radio_path)eRFPath);
                                RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
                                               (enum rf90_radio_path)eRFPath,

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 36090f7879fb3282cdd771a46db142f2cb718ec4..cc39cb5cbfc7eecce0095edd7810b9ce8b90a1bd 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -717,8 +717,7 @@ void rtl8192_phy_updateInitGain(struct net_device *dev)
 {
 }
 
-u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev,
-                                     enum rf90_radio_path eRFPath)
+u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
 {
 
        int i;

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 4cfd4cb3d5b27333f861af9637310621411c8b01..94218038a316542b93ba303a88c8613157fc80f0 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -87,8 +87,8 @@ extern void rtl8192_phy_getTxPower(struct net_device *dev);
 extern void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel);
 extern bool rtl8192_phy_RFConfig(struct net_device *dev);
 extern void rtl8192_phy_updateInitGain(struct net_device *dev);
-extern u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev,
-                                            enum rf90_radio_path eRFPath);
+extern u8 rtl92e_config_rf_path(struct net_device *dev,
+                               enum rf90_radio_path eRFPath);
 
 extern u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel);
 extern void rtl8192_SetBWMode(struct net_device *dev,