staging: rtl8192e: Rename rtl8192_phy_QueryRFReg

Use naming schema found in other rtlwifi devices.
Rename rtl8192_phy_QueryRFReg to rtl92e_get_rf_reg.

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 9ed8637..510dfb2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
@@ -143,7 +143,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                               RetryTimes != 0) {
                                ret = rtl92e_config_rf_path(dev,
                                                (enum rf90_radio_path)eRFPath);
-                               RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
+                               RF3_Final_Value = rtl92e_get_rf_reg(dev,
                                                 (enum rf90_radio_path)eRFPath,
                                                 RegOffSetToBeCheck,
                                                 bMask12Bits);
@@ -159,7 +159,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                               RetryTimes != 0) {
                                ret = rtl92e_config_rf_path(dev,
                                                (enum rf90_radio_path)eRFPath);
-                               RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
+                               RF3_Final_Value = rtl92e_get_rf_reg(dev,
                                                 (enum rf90_radio_path)eRFPath,
                                                 RegOffSetToBeCheck,
                                                 bMask12Bits);
@@ -175,7 +175,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                               RetryTimes != 0) {
                                ret = rtl92e_config_rf_path(dev,
                                                (enum rf90_radio_path)eRFPath);
-                               RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
+                               RF3_Final_Value = rtl92e_get_rf_reg(dev,
                                                (enum rf90_radio_path)eRFPath,
                                                RegOffSetToBeCheck,
                                                bMask12Bits);
@@ -191,7 +191,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                               RetryTimes != 0) {
                                ret = rtl92e_config_rf_path(dev,
                                               (enum rf90_radio_path)eRFPath);
-                               RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
+                               RF3_Final_Value = rtl92e_get_rf_reg(dev,
                                               (enum rf90_radio_path)eRFPath,
                                               RegOffSetToBeCheck, bMask12Bits);
                                RT_TRACE(COMP_RF,

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 8800c82..c245f95 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -256,8 +256,8 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, enum rf90_radio_path eRFPath,
        }
 }
 
-u32 rtl8192_phy_QueryRFReg(struct net_device *dev, enum rf90_radio_path eRFPath,
-                          u32 RegAddr, u32 BitMask)
+u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
+                     u32 RegAddr, u32 BitMask)
 {
        u32 Original_Value, Readback_Value, BitShift;
        struct r8192_priv *priv = rtllib_priv(dev);
@@ -525,9 +525,9 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, enum hw90_block CheckBlock,
                                                 WriteAddr[HW90_BLOCK_RF],
                                                 bMask12Bits, WriteData[i]);
                        mdelay(10);
-                       dwRegRead = rtl8192_phy_QueryRFReg(dev, eRFPath,
-                                                WriteAddr[HW90_BLOCK_RF],
-                                                bMaskDWord);
+                       dwRegRead = rtl92e_get_rf_reg(dev, eRFPath,
+                                                     WriteAddr[HW90_BLOCK_RF],
+                                                     bMaskDWord);
                        mdelay(10);
                        break;
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 67a7be9..2dd9474 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -75,9 +75,9 @@ extern u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr,
 extern void rtl8192_phy_SetRFReg(struct net_device *dev,
                                 enum rf90_radio_path eRFPath,
                                 u32 RegAddr, u32 BitMask, u32 Data);
-extern u32 rtl8192_phy_QueryRFReg(struct net_device *dev,
-                                 enum rf90_radio_path eRFPath,
-                                 u32 RegAddr, u32 BitMask);
+extern u32 rtl92e_get_rf_reg(struct net_device *dev,
+                            enum rf90_radio_path eRFPath, u32 RegAddr,
+                            u32 BitMask);
 extern void rtl92e_config_mac(struct net_device *dev);
 extern bool rtl92e_check_bb_and_rf(struct net_device *dev,
                                   enum hw90_block CheckBlock,

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 47ead37..54ec25f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -883,7 +883,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
                return;
        }
 
-       tmpRegA = rtl8192_phy_QueryRFReg(dev, RF90_PATH_A, 0x12, 0x078);
+       tmpRegA = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
        RT_TRACE(COMP_POWER_TRACKING, "Readback ThermalMeterA = %d\n", tmpRegA);
        if (tmpRegA < 3 || tmpRegA > 13)
                return;