Commit 4d415dec authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman

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: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78cc16fa
...@@ -143,7 +143,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -143,7 +143,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
RetryTimes != 0) { RetryTimes != 0) {
ret = rtl92e_config_rf_path(dev, ret = rtl92e_config_rf_path(dev,
(enum rf90_radio_path)eRFPath); (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, (enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, RegOffSetToBeCheck,
bMask12Bits); bMask12Bits);
...@@ -159,7 +159,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -159,7 +159,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
RetryTimes != 0) { RetryTimes != 0) {
ret = rtl92e_config_rf_path(dev, ret = rtl92e_config_rf_path(dev,
(enum rf90_radio_path)eRFPath); (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, (enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, RegOffSetToBeCheck,
bMask12Bits); bMask12Bits);
...@@ -175,7 +175,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -175,7 +175,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
RetryTimes != 0) { RetryTimes != 0) {
ret = rtl92e_config_rf_path(dev, ret = rtl92e_config_rf_path(dev,
(enum rf90_radio_path)eRFPath); (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, (enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, RegOffSetToBeCheck,
bMask12Bits); bMask12Bits);
...@@ -191,7 +191,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -191,7 +191,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
RetryTimes != 0) { RetryTimes != 0) {
ret = rtl92e_config_rf_path(dev, ret = rtl92e_config_rf_path(dev,
(enum rf90_radio_path)eRFPath); (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, (enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, bMask12Bits); RegOffSetToBeCheck, bMask12Bits);
RT_TRACE(COMP_RF, RT_TRACE(COMP_RF,
......
...@@ -256,8 +256,8 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, enum rf90_radio_path eRFPath, ...@@ -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 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
u32 RegAddr, u32 BitMask) u32 RegAddr, u32 BitMask)
{ {
u32 Original_Value, Readback_Value, BitShift; u32 Original_Value, Readback_Value, BitShift;
struct r8192_priv *priv = rtllib_priv(dev); 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, ...@@ -525,9 +525,9 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, enum hw90_block CheckBlock,
WriteAddr[HW90_BLOCK_RF], WriteAddr[HW90_BLOCK_RF],
bMask12Bits, WriteData[i]); bMask12Bits, WriteData[i]);
mdelay(10); mdelay(10);
dwRegRead = rtl8192_phy_QueryRFReg(dev, eRFPath, dwRegRead = rtl92e_get_rf_reg(dev, eRFPath,
WriteAddr[HW90_BLOCK_RF], WriteAddr[HW90_BLOCK_RF],
bMaskDWord); bMaskDWord);
mdelay(10); mdelay(10);
break; break;
......
...@@ -75,9 +75,9 @@ extern u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, ...@@ -75,9 +75,9 @@ extern u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr,
extern void rtl8192_phy_SetRFReg(struct net_device *dev, extern void rtl8192_phy_SetRFReg(struct net_device *dev,
enum rf90_radio_path eRFPath, enum rf90_radio_path eRFPath,
u32 RegAddr, u32 BitMask, u32 Data); u32 RegAddr, u32 BitMask, u32 Data);
extern u32 rtl8192_phy_QueryRFReg(struct net_device *dev, extern u32 rtl92e_get_rf_reg(struct net_device *dev,
enum rf90_radio_path eRFPath, enum rf90_radio_path eRFPath, u32 RegAddr,
u32 RegAddr, u32 BitMask); u32 BitMask);
extern void rtl92e_config_mac(struct net_device *dev); extern void rtl92e_config_mac(struct net_device *dev);
extern bool rtl92e_check_bb_and_rf(struct net_device *dev, extern bool rtl92e_check_bb_and_rf(struct net_device *dev,
enum hw90_block CheckBlock, enum hw90_block CheckBlock,
......
...@@ -883,7 +883,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) ...@@ -883,7 +883,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
return; 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); RT_TRACE(COMP_POWER_TRACKING, "Readback ThermalMeterA = %d\n", tmpRegA);
if (tmpRegA < 3 || tmpRegA > 13) if (tmpRegA < 3 || tmpRegA > 13)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment